Changeset 7683 for trunk/src/user32/button.cpp

Timestamp:

Dec 26, 2001, 12:35:39 PM (24 years ago)

Author:

sandervl

Message:

WM_CTLCOLOR fix for buttonsbutton.cpp

File:

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

trunk/src/user32/button.cpp

@@ -1 @@
-/* $Id: button.cpp,v 1.44 2001-11-21 11:51:37 sandervl Exp $ */
+/* $Id: button.cpp,v 1.45 2001-12-26 11:35:38 sandervl Exp $ */
 /* File: button.cpp -- Button type widgets
  *
@@ -1028 +1028 @@
     if (infoPtr->hFont) SelectObject( hDC, infoPtr->hFont );
 
-    /* GetControlBrush16 sends WM_CTLCOLORBTN, plus it returns default brush
-     * if parent didn't return valid one. So we kill two hares at once
-     */
-    hBrush = GetControlBrush( hwnd, hDC, CTLCOLOR_BTN );
-
-    /* In order to make things right, draw the rectangle background! */
-    if ( !(infoPtr->state & BUTTON_HASFOCUS) && (action == ODA_DRAWENTIRE) )
-    {
-        colour = GetBkColor(hDC);
-        hPen = CreatePen( PS_SOLID, 1, colour );
-        if ( hPen )
-        {
-            hOldBrush = SelectObject( hDC, hBrush );
-            hOldPen = SelectObject( hDC, hPen );
-            Rectangle( hDC, client.left, client.top, client.right, client.bottom );
-            SelectObject( hDC, hOldPen );
-            SelectObject( hDC, hOldBrush );
-            DeleteObject( hPen );
-        }
-    }
+#ifdef __WIN32OS2__
+    //(Auto)Check, (Auto)Radio & (Auto)3State buttons send WM_CTLCOLORSTATIC
+    //instead of WM_CTLCOLORBTN (verified in NT4)
+    hBrush = SendMessageW( GetParent(hwnd), WM_CTLCOLORSTATIC, hDC, (LPARAM)hwnd );
+    if (!hBrush) /* did the app forget to call defwindowproc ? */
+        hBrush = DefWindowProcW( GetParent(hwnd), WM_CTLCOLORSTATIC, hDC, (LPARAM)hwnd );
+#endif
 
     if (dwStyle & BS_LEFTTEXT)
@@ -1077 +1064 @@
     {
         UINT state;
+
+        /* Since WM_ERASEBKGND does nothing, first prepare background */
+        if (action == ODA_SELECT) FillRect( hDC, &rbox, hBrush );
+        else FillRect( hDC, &client, hBrush );
 
         if (((dwStyle & 0x0f) == BS_RADIOBUTTON) ||