Changeset 4674 for trunk/src

Timestamp:

Nov 22, 2000, 2:44:50 PM (25 years ago)

Author:

sandervl

Message:

WM_CTLCOLOR fixes for apps that don't return brushes

Location:

trunk/src/user32

Files:

• button.cpp (modified) (7 diffs)
• dc.cpp (modified) (2 diffs)
• syscolor.cpp (modified) (3 diffs)
• syscolor.h (modified) (2 diffs)

trunk/src/user32/button.cpp

@@ -1 @@
-/* $Id: button.cpp,v 1.37 2000-06-07 14:51:24 sandervl Exp $ */
+/* $Id: button.cpp,v 1.38 2000-11-22 13:44:49 sandervl Exp $ */
 /* File: button.cpp -- Button type widgets
  *
@@ -21 +21 @@
 #include <misc.h>
 #include "initterm.h"
+#include "syscolor.h"
 
 #define DBG_LOCALLOG    DBG_button
@@ -951 +952 @@
     if (infoPtr->hFont) SelectObject( hDC, infoPtr->hFont );
 
-    /* Something is still not right, checkboxes (and edit controls)
-     * in wsping32 have white backgrounds instead of dark grey.
-     * BUTTON_SEND_CTLCOLOR() is even worse since it returns 0 in this
-     * particular case and the background is not painted at all.
+    /* GetControlBrush16 sends WM_CTLCOLORBTN, plus it returns default brush
+     * if parent didn't return valid one. So we kill two hares at once
      */
-    //SvL: 20/09/99: This works well for us. Now the background of
-    //               the dialog button strings in Solitaire is gray
-    SendMessageA(GetParent(hwnd),WM_CTLCOLORBTN,hDC,hwnd);
-
-    hBrush = GetSysColorBrush(COLOR_BTNFACE);
+    hBrush = GetControlBrush( hwnd, hDC, CTLCOLOR_BTN );
 
     /* In order to make things right, draw the rectangle background! */
@@ -1091 +1086 @@
     INT textLen;
     char* text;
+    HBRUSH hbr;
 
     if (action != ODA_DRAWENTIRE) return;
 
-    SendMessageA(GetParent(hwnd),WM_CTLCOLORBTN,hDC,hwnd);
+    /* GroupBox acts like static control, so it sends CTLCOLORSTATIC */
+    hbr = GetControlBrush( hwnd, hDC, CTLCOLOR_STATIC );
 
     GetClientRect(hwnd,&rc);
@@ -1117 +1114 @@
       rc.left += 10;
 
-      if (dwStyle & WS_DISABLED) DrawDisabledText(hDC,text,&rc,format); else
+      if (dwStyle & WS_DISABLED) {
+           DrawDisabledText(hDC,text,&rc,format); 
+      }
+      else
       {
-        SetTextColor(hDC,GetSysColor(COLOR_BTNTEXT));
-        DrawTextA(hDC,text,-1,&rc,format);
+           SetTextColor(hDC,GetSysColor(COLOR_BTNTEXT));
+           DrawTextA(hDC,text,-1,&rc,format);
       }
 
@@ -1143 +1143 @@
 
     if (infoPtr->hFont) SelectObject( hDC, infoPtr->hFont );
-    hBrush = GetSysColorBrush(COLOR_BTNFACE);
-
+    hBrush = GetControlBrush( hwnd, hDC, CTLCOLOR_BTN );
+
+    FillRect( hDC, &rc, hBrush );
     if ((action == ODA_FOCUS) ||
         ((action == ODA_DRAWENTIRE) && (infoPtr->state & BUTTON_HASFOCUS) && IsWindowEnabled(hwnd)))
@@ -1151 +1152 @@
       InflateRect(&rc,-1,-1);
     }
-    FillRect( hDC, &rc, hBrush );
 }
 

trunk/src/user32/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.78 2000-11-15 13:57:56 sandervl Exp $ */
+/* $Id: dc.cpp,v 1.79 2000-11-22 13:44:49 sandervl Exp $ */
 
 /*
@@ -1232 +1232 @@
         }
         else {
+            dprintf2(("WinInvalidateRect (%d,%d)(%d,%d)", rectl.xLeft, rectl.yBottom, rectl.xRight, rectl.yTop));
             success = WinInvalidateRect (hwnd, &rectl, IncludeChildren);
 //SvL: If all children are included, then WinInvalidateRect is called

trunk/src/user32/syscolor.cpp

@@ -1 @@
-/* $Id: syscolor.cpp,v 1.23 2000-10-17 17:11:07 sandervl Exp $ */
+/* $Id: syscolor.cpp,v 1.24 2000-11-22 13:44:50 sandervl Exp $ */
 
 /*
@@ -27 +27 @@
 #define DBG_LOCALLOG    DBG_syscolor
 #include "dbglocal.h"
+
+#define CTLCOLOR_MAX   CTLCOLOR_STATIC
 
 //SvL: Open32 colors are much better than those in the table below
@@ -306 +308 @@
     return hPattern55AABitmap;
 }
+//******************************************************************************
+//******************************************************************************
+HBRUSH WIN32API GetControlBrush(HWND hwnd, HDC hdc, DWORD ctlType)
+{
+ HBRUSH bkgBrush = 0;
+
+    if(ctlType <= CTLCOLOR_MAX)
+    {
+        bkgBrush = (HBRUSH)SendMessageA(GetParent(hwnd), WM_CTLCOLORMSGBOX + ctlType, 
+                                        (WPARAM)hdc, (LPARAM)hwnd );
+
+        if(GetObjectType(bkgBrush) != OBJ_BRUSH)
+             bkgBrush = DefWindowProcA(hwnd, WM_CTLCOLORMSGBOX + ctlType, hdc, ctlType);
+    }
+    return bkgBrush;
+}
+//******************************************************************************
+//******************************************************************************

trunk/src/user32/syscolor.h

@@ -1 @@
-/* $Id: syscolor.h,v 1.12 2000-02-23 17:05:17 cbratschi Exp $ */
+/* $Id: syscolor.h,v 1.13 2000-11-22 13:44:50 sandervl Exp $ */
 
 /*
@@ -22 +22 @@
 extern BOOL SYSCOLOR_GetUseWinColors(VOID);
 
+HBRUSH WIN32API GetControlBrush(HWND hwnd, HDC hdc, DWORD ctlType);
+
 #endif  /* __WINE_SYSCOLOR_H */