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

Timestamp:

Sep 20, 1999, 9:17:58 PM (26 years ago)

Author:

sandervl

Message:

Fixes for incorrect background color for button, group & static text

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.3 1999-09-19 18:33:32 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.4 1999-09-20 19:17:58 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -1084 +1084 @@
         return(TRUE);
 
+    //SvL: Set background color to default button color (not window (white))
+    case WM_CTLCOLORBTN:
+         SetBkColor((HDC)wParam, GetSysColor(COLOR_BTNFACE));
+         SetTextColor((HDC)wParam, GetSysColor(COLOR_WINDOWTEXT));
+         return GetSysColorBrush(COLOR_BTNFACE);
+        
+    //SvL: Set background color to default dialog color if window is dialog
+    case WM_CTLCOLORDLG:
+    case WM_CTLCOLORSTATIC:
+         if(IsDialog()) {
+                SetBkColor((HDC)wParam, GetSysColor(COLOR_BTNFACE));
+                SetTextColor((HDC)wParam, GetSysColor(COLOR_WINDOWTEXT));
+                return GetSysColorBrush(COLOR_BTNFACE);
+         }
+         //no break
+
     case WM_CTLCOLORMSGBOX:
     case WM_CTLCOLOREDIT:
     case WM_CTLCOLORLISTBOX:
-    case WM_CTLCOLORBTN:
-    case WM_CTLCOLORDLG:
-    case WM_CTLCOLORSTATIC:
     case WM_CTLCOLORSCROLLBAR:
          SetBkColor((HDC)wParam, GetSysColor(COLOR_WINDOW));