Changeset 6001 for trunk/src/user32

Timestamp:

Jun 13, 2001, 7:28:07 PM (24 years ago)

Author:

sandervl

Message:

wm_erasebkgnd handling changes for dialogs

Location:

trunk/src/user32

Files:

• win32dlg.cpp (modified) (3 diffs)
• win32wbase.cpp (modified) (3 diffs)

trunk/src/user32/win32dlg.cpp

@@ -1 @@
-/* $Id: win32dlg.cpp,v 1.68 2001-06-12 18:25:11 sandervl Exp $ */
+/* $Id: win32dlg.cpp,v 1.69 2001-06-13 17:28:06 sandervl Exp $ */
 /*
  * Win32 Dialog Code for OS/2
@@ -729 +729 @@
       int rc;
 
-//        if (!windowClass || !windowClass->getBackgroundBrush()) return 0;
         if (!windowClass) return 0;
 
@@ -735 +734 @@
         if ((rc == SIMPLEREGION) || (rc == COMPLEXREGION))
         {
-#if 0
-            HBRUSH hBrush = windowClass->getBackgroundBrush();
-
-            if (hBrush <= (HBRUSH)(SYSCOLOR_GetLastColor()+1))
-                hBrush = GetSysColorBrush(hBrush-1);
-
-            FillRect( (HDC)wParam, &rect, hbrush);
-#else
-            //SvL: Ignore class background brush
-            FillRect((HDC)wParam, &rect, GetSysColorBrush(COLOR_BTNFACE));
-#endif
+            HBRUSH hBrush = SendInternalMessageA(WM_CTLCOLORDLG, wParam, getWindowHandle());
+            if(GetObjectType(hBrush) != OBJ_BRUSH) {
+                DefWndControlColor(CTLCOLOR_DLG, (HDC)wParam);
+            }
+            FillRect( (HDC)wParam, &rect, hBrush);
         }
 

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.267 2001-06-13 12:19:09 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.268 2001-06-13 17:28:07 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -1343 +1343 @@
         return GetSysColorBrush(COLOR_BTNFACE);
     }
-
     if( ctlType == CTLCOLOR_SCROLLBAR)
     {
@@ -1618 +1617 @@
       RECT rect;
       int rc;
-
-        if(getWindowHandle() == 0x68000044) {
-          rc = GetClipBox( (HDC)wParam, &rect );
-          FillRect( (HDC)wParam, &rect, GetSysColorBrush(COLOR_WINDOWTEXT));
-          return 1;
-        }
 
         if (!windowClass || !windowClass->getBackgroundBrush()) return 0;