Changeset 10316 for trunk/src/user32/win32wbase.cpp

Timestamp:

Nov 12, 2003, 3:13:26 PM (22 years ago)

Author:

sandervl

Message:

Visible & Clip region changes

File:

• trunk/src/user32/win32wbase.cpp (modified) (9 diffs)

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.379 2003-10-20 17:17:23 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.380 2003-11-12 14:10:20 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -117 +117 @@
   fComingToTop     = FALSE;
   fMinMaxChange    = FALSE;
-  fVisibleRegionChanged = FALSE;
+  fPMUpdateRegionChanged = FALSE;
   fEraseBkgndFlag  = TRUE;
   fIsDragDropActive= FALSE;
@@ -178 +178 @@
   hWindowRegion      = 0;
   hClipRegion        = 0;
+  hVisRegion         = 0;
   hUpdateRegion      = 0;
 
@@ -1219 +1220 @@
     HDC   hdcErase = hdc;
 
-    if (hdcErase == 0)
-        hdcErase = GetDC(getWindowHandle());
+    if (hdcErase == 0) {
+        DebugInt3();
+        return 0;
+    }
 
     if(IsWindowIconic())
@@ -1226 +1229 @@
     else
         rc = SendMessageA(getWindowHandle(),WM_ERASEBKGND, hdcErase, 0);
-    if (hdc == 0)
-        ReleaseDC(getWindowHandle(), hdcErase);
+
     return (rc);
 }
@@ -1250 +1252 @@
 }
 //******************************************************************************
-//TODO: Should use update region, not rectangle
-//******************************************************************************
-ULONG Win32BaseWindow::MsgNCPaint(PRECT pUpdateRect)
-{
-    HRGN hrgn;
+//******************************************************************************
+ULONG Win32BaseWindow::MsgNCPaint(PRECT pUpdateRect, HRGN hrgnUpdate)
+{
     ULONG rc;
     RECT client = rectClient;
@@ -1267 +1267 @@
     }
 
-    dprintf(("MsgNCPaint (%d,%d)(%d,%d)", pUpdateRect->left, pUpdateRect->top, pUpdateRect->right, pUpdateRect->bottom));
-    hrgn = CreateRectRgnIndirect(pUpdateRect);
-
-    rc = SendMessageA(getWindowHandle(),WM_NCPAINT, hrgn, 0);
+    rc = SendMessageA(getWindowHandle(),WM_NCPAINT, hrgnUpdate, 0);
     //Send WM_PAINTICON here if minimized, because client window will
     //not receive a (valid) WM_PAINT message
@@ -1277 +1274 @@
         rc = SendMessageA(getWindowHandle(),WM_PAINTICON, 1, 0);
     }
-
-    DeleteObject(hrgn);
 
     return rc;
@@ -2919 +2914 @@
 }
 //******************************************************************************
-//Note: does not set last error if no parent (verified in NT4, SP6)
+// Win32BaseWindow::GetParent
+//
+// If the window is a child window, then return the parent window handle.
+// If it's a popup window, then return the owner
+//
+// Returns window handle of parent or owner window
+//
+// Note: does not set last error if no parent (verified in NT4, SP6)
 //******************************************************************************
 HWND Win32BaseWindow::GetParent()