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

Timestamp:

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

Author:

sandervl

Message:

WM_ERASEBKGND changes

File:

• trunk/src/user32/win32dlg.cpp (modified) (3 diffs)

trunk/src/user32/win32dlg.cpp

@@ -1 @@
-/* $Id: win32dlg.cpp,v 1.41 2000-01-18 20:10:52 sandervl Exp $ */
+/* $Id: win32dlg.cpp,v 1.42 2000-02-05 16:24:58 sandervl Exp $ */
 /*
  * Win32 Dialog Code for OS/2
@@ -23 +23 @@
 #include "win32wdesktop.h"
 #include "controls.h"
+#include "syscolor.h"
 
 #define DEFAULT_DLGFONT "9.WarpSans"
@@ -696 +697 @@
       RECT rect;
       int rc;
-        /*  Since WM_ERASEBKGND may receive either a window dc or a    */
-        /*  client dc, the area to be erased has to be retrieved from  */
-        /*  the device context.                    */
-        rc = GetClipBox( (HDC)wParam, &rect );
+
+        if (!windowClass || !windowClass->getBackgroundBrush()) return 0;
+
+//        rc = GetClipBox( (HDC)wParam, &rect );
+        rc = GetRgnBox(hUpdateRegion, &rect);
         if ((rc == SIMPLEREGION) || (rc == COMPLEXREGION))
-            FillRect( (HDC)wParam, &rect, windowClass->getBackgroundBrush());
+        {
+            HBRUSH hBrush = windowClass->getBackgroundBrush();
+
+            if (hBrush <= (HBRUSH)(SYSCOLOR_GetLastColor()+1))
+                hBrush = GetSysColorBrush(hBrush-1);
+
+//          FillRect( (HDC)wParam, &rect, hBrush);
+                FillRgn((HDC)wParam, hUpdateRegion, hBrush);
+        }
+
         return 1;
     }
+
     case WM_NCDESTROY:
           /* Free dialog heap (if created) */