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

Timestamp:

Feb 5, 2000, 5:25:00 PM (26 years ago)

Author:

sandervl

Message:

WM_ERASEBKGND changes

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.152 2000-02-05 14:08:53 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.153 2000-02-05 16:24:59 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -145 +145 @@
   ownDC              = 0;
   hWindowRegion      = 0;
+  hUpdateRegion      = CreateRectRgn(0, 0, 0, 0);
 
   if(currentProcessId == -1)
@@ -178 +179 @@
     }
 
-    if (isOwnDC())
-        releaseOwnDC (ownDC);
+    if(hUpdateRegion) {
+        DeleteObject(hUpdateRegion);
+        hUpdateRegion = 0;
+    }
+
+    if(isOwnDC())
+        releaseOwnDC(ownDC);
 
     if(Win32Hwnd)
@@ -186 +192 @@
     if(userWindowLong)
         free(userWindowLong);
+
     if(windowNameA) {
         free(windowNameA);
@@ -1433 +1440 @@
         if (!windowClass || !windowClass->getBackgroundBrush()) return 0;
 
-        rc = GetClipBox( (HDC)wParam, &rect );
+//        rc = GetClipBox( (HDC)wParam, &rect );
+        rc = GetRgnBox(hUpdateRegion, &rect);
         if ((rc == SIMPLEREGION) || (rc == COMPLEXREGION))
         {
-          HBRUSH hBrush = windowClass->getBackgroundBrush();
-
-          if (hBrush <= (HBRUSH)(SYSCOLOR_GetLastColor()+1)) hBrush = GetSysColorBrush(hBrush-1);
-
-          FillRect( (HDC)wParam, &rect, hBrush);
+            HBRUSH hBrush = windowClass->getBackgroundBrush();
+
+            if (hBrush <= (HBRUSH)(SYSCOLOR_GetLastColor()+1))
+                hBrush = GetSysColorBrush(hBrush-1);
+
+//          FillRect( (HDC)wParam, &rect, hBrush);
+                FillRgn((HDC)wParam, hUpdateRegion, hBrush);
         }
 
@@ -2724 +2734 @@
                     return value;
 
-                        value &= ~(WS_VISIBLE | WS_CHILD);      /* Some bits can't be changed this way (WINE) */
+                value &= ~(WS_VISIBLE | WS_CHILD);      /* Some bits can't be changed this way (WINE) */
                 ss.styleOld = getStyle();
-                        ss.styleNew = value | (ss.styleOld & (WS_VISIBLE | WS_CHILD));
+                ss.styleNew = value | (ss.styleOld & (WS_VISIBLE | WS_CHILD));
                 dprintf(("SetWindowLong GWL_STYLE %x old %x new style %x", getWindowHandle(), ss.styleOld, ss.styleNew));
                 SendInternalMessageA(WM_STYLECHANGING,GWL_STYLE,(LPARAM)&ss);
                 setStyle(ss.styleNew);
                 SendInternalMessageA(WM_STYLECHANGED,GWL_STYLE,(LPARAM)&ss);
-                OSLibSetWindowStyle(getOS2FrameWindowHandle(), getStyle(), getExStyle(),
-                                    windowClass->getStyle() & CS_SAVEBITS);
+////                OSLibSetWindowStyle(getOS2FrameWindowHandle(), getStyle(), getExStyle(),
+////                                    windowClass->getStyle() & CS_SAVEBITS);
 #ifdef DEBUG
                 PrintWindowStyle(ss.styleNew, 0);