Changeset 7683 for trunk/src

Timestamp:

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

Author:

sandervl

Message:

WM_CTLCOLOR fix for buttonsbutton.cpp

Location:

trunk/src/user32

Files:

• button.cpp (modified) (3 diffs)
• dc.cpp (modified) (4 diffs)
• menu.cpp (modified) (3 diffs)
• win32wbase.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) ||

trunk/src/user32/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.113 2001-12-13 15:32:57 sandervl Exp $ */
+/* $Id: dc.cpp,v 1.114 2001-12-26 11:35:38 sandervl Exp $ */
 
 /*
@@ -78 +78 @@
 #ifdef DEBUG
 #define dprintfRegion(a,b,c) if(DbgEnabledLvl2USER32[DBG_LOCALLOG] == 1) dprintfRegion1(a,b,c)
+//#define dprintfRegion(a,b,c) dprintfRegion1(a,b,c)
 
 void dprintfRegion1(HPS hps, HWND hWnd, HRGN hrgnClip)
@@ -1316 +1317 @@
         dprintf2(("Update region (%d,%d)(%d,%d)", rectl.xLeft, rectl.yBottom, rectl.xRight, rectl.yTop));
         //TODO: Does this work if RDW_ALLCHILDREN is set??
-        if(redraw & RDW_UPDATENOW_W) {
-            RECT rectUpdate;
-
-            if(redraw & RDW_FRAME_W) {
-                mapOS2ToWin32Rect(wnd->getWindowHeight(), (PRECTLOS2)&rectl, &rectUpdate);
-                wnd->MsgNCPaint(&rectUpdate);
-            }
-
-            wnd->MsgPaint(0, FALSE);
+        if(redraw & RDW_UPDATENOW_W) 
+        {
+            dprintf(("RDW_UPDATENOW -> UpdateWindow"));
+            UpdateWindow(wnd->getWindowHandle());
         }
         else
@@ -1336 +1332 @@
     else if((redraw & RDW_INTERNALPAINT_W) && !(redraw & RDW_INVALIDATE_W))
     {
+        dprintf(("Manual redraw"));
         if(redraw & RDW_UPDATENOW_W) {
             wnd->MsgPaint(0, FALSE);

trunk/src/user32/menu.cpp

@@ -1 @@
-/* $Id: menu.cpp,v 1.43 2001-12-01 16:02:16 sandervl Exp $*/
+/* $Id: menu.cpp,v 1.44 2001-12-26 11:35:39 sandervl Exp $*/
 /*
  * Menu functions
@@ -4436 +4436 @@
                                   LPMENUITEMINFOA lpmii)
 {
-    dprintf(("USER32: GetMenuItemInfoA"));
+    dprintf(("USER32: GetMenuItemInfoA %x %d %d %x", hmenu, item, bypos, lpmii));
 
     return GetMenuItemInfo_common (hmenu, item, bypos, lpmii, FALSE);
@@ -4447 +4447 @@
                                   LPMENUITEMINFOW lpmii)
 {
-    dprintf(("USER32: GetMenuItemInfoW"));
+    dprintf(("USER32: GetMenuItemInfoW %x %d %d %x", hmenu, item, bypos, lpmii));
 
     return GetMenuItemInfo_common (hmenu, item, bypos,

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.305 2001-12-12 16:40:44 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.306 2001-12-26 11:35:39 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -2160 +2160 @@
   }
   fInternalMsg = fInternalMsgBackup;
-  dprintf2(("SendMessageA %x %x %x %x returned %d", getWindowHandle(), Msg, wParam, lParam, rc));
+  dprintf2(("SendMessageA %x %x %x %x returned %x", getWindowHandle(), Msg, wParam, lParam, rc));
   return rc;
 }
@@ -2221 +2221 @@
   }
   fInternalMsg = fInternalMsgBackup;
-  dprintf2(("SendMessageW %x %x %x %x returned %d", getWindowHandle(), Msg, wParam, lParam, rc));
+  dprintf2(("SendMessageW %x %x %x %x returned %x", getWindowHandle(), Msg, wParam, lParam, rc));
   return rc;
 }