Changeset 4147 for trunk/src

Timestamp:

Sep 2, 2000, 10:30:11 AM (25 years ago)

Author:

sandervl

Message:

Commented out winzip button change in BeginPaint (fixes repaint problems) + implemented IsZoomed)

Location:

trunk/src/user32

Files:

• dc.cpp (modified) (4 diffs)
• win32wbase.cpp (modified) (3 diffs)
• window.cpp (modified) (2 diffs)

trunk/src/user32/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.69 2000-07-22 12:51:59 sandervl Exp $ */
+/* $Id: dc.cpp,v 1.70 2000-09-02 08:30:09 sandervl Exp $ */
 
 /*
@@ -546 +546 @@
 //******************************************************************************
 //******************************************************************************
+#ifdef DEBUG
+#define dprintfRegion(a,b,c) if(DbgEnabledLvl2[DBG_LOCALLOG] == 1) dprintfRegion1(a,b,c)
+
+void dprintfRegion1(HPS hps, HWND hWnd, HRGN hrgnClip)
+{
+ RGNRECT rgnRect = {0, 16, 0, RECTDIR_LFRT_TOPBOT};
+ RECTL   rectRegion[16];
+ APIRET  rc;
+
+   dprintf(("dprintfRegion %x %x", hWnd, hps));
+   rc = GpiQueryRegionRects(hps, hrgnClip, NULL, &rgnRect, &rectRegion[0]);
+   for(int i=0;i<rgnRect.crcReturned;i++) {
+        dprintf(("(%d,%d)(%d,%d)", rectRegion[i].xLeft, rectRegion[i].yBottom, rectRegion[i].xRight, rectRegion[i].yTop));
+   }
+}
+#else
+#define dprintfRegion(a,b,c)
+#endif
+//******************************************************************************
+//******************************************************************************
 HDC WIN32API BeginPaint (HWND hWnd, PPAINTSTRUCT_W lpps)
 {
@@ -592 +612 @@
    }
 
-   //testest
-   if(hwnd == 0x6800000f) {
-        lComplexity = 1;
-   }
-
    if(WinQueryUpdateRect(hwndClient, &rectl) == FALSE) {
         memset(&rectl, 0, sizeof(rectl));
@@ -615 +630 @@
 
         //Query update region
+#if 1
+        HRGN hrgnClip = GpiCreateRegion(pHps->hps, 1, &rectl);
+#else
         HRGN hrgnClip = GpiCreateRegion(pHps->hps, 1, &rectlClip);
         WinQueryUpdateRegion(hwndClient, hrgnClip);
+        dprintfRegion(pHps->hps, hWnd, hrgnClip);
+        WinQueryVisibleRegion(hwndClient, hrgnClip);
+        dprintfRegion(pHps->hps, hWnd, hrgnClip);
+        WinQueryUpdateRegion(hwndClient, hrgnClip);
+#endif
         WinValidateRegion(hwndClient, hrgnClip, FALSE);
 

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.208 2000-07-20 18:08:13 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.209 2000-09-02 08:30:09 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -1616 +1616 @@
             if(window && !(window->getClass()->getStyle() & CS_NOCLOSE))
                 PostMessageA(getWindowHandle(), WM_SYSCOMMAND, SC_CLOSE, 0);
+            return 0;
         }
 
@@ -2188 +2189 @@
    RECT oldClientRect = rectClient;
 
+    if(getWindowHandle() == 0x6800000a) {
+        rc = FALSE;
+    }
     if (fuFlags &
        ~(SWP_NOSIZE     | SWP_NOMOVE     | SWP_NOZORDER     |

trunk/src/user32/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.72 2000-08-02 20:18:25 bird Exp $ */
+/* $Id: window.cpp,v 1.73 2000-09-02 08:30:11 sandervl Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -707 +707 @@
 BOOL WIN32API IsZoomed(HWND hwnd)
 {
-    dprintf(("USER32:  IsZoomed\n"));
-    return O32_IsZoomed(Win32BaseWindow::Win32ToOS2Handle(hwnd));
+ DWORD style;
+
+    style = GetWindowLongA(hwnd, GWL_STYLE);
+    dprintf(("USER32: IsZoomed %x returned %d", hwnd, ((style & WS_MAXIMIZE) != 0)));
+
+    return (style & WS_MAXIMIZE) != 0;
 }
 //******************************************************************************