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

Timestamp:

Oct 9, 1999, 1:03:23 PM (26 years ago)

Author:

sandervl

Message:

Syscolor + button WM_ENABLE fixes

File:

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

trunk/src/user32/button.cpp

@@ -1 @@
-/* $Id: button.cpp,v 1.5 1999-10-08 21:23:07 cbratschi Exp $ */
+/* $Id: button.cpp,v 1.6 1999-10-09 11:03:22 sandervl Exp $ */
 /* File: button.cpp -- Button type widgets
  *
@@ -22 +22 @@
 #include "controls.h"
 #include "button.h"
+#include <misc.h>
 
 //Prototypes
@@ -118 +119 @@
   DWORD dwStyle = GetWindowLongA(hwnd,GWL_STYLE);
 
-  PAINT_BUTTON(hwnd,dwStyle & 0x0f,ODA_DRAWENTIRE);
+//  PAINT_BUTTON(hwnd,dwStyle & 0x0f,ODA_DRAWENTIRE);
+  //SvL: 09/10/99 Force it to redraw properly
+  InvalidateRect( hwnd, NULL, FALSE );
 
   return 0;
@@ -696 +699 @@
         GetWindowTextA(hwnd,text,textLen);
         GetObjectA( GetSysColorBrush(COLOR_BTNFACE), sizeof(lb), &lb );
-        if (dwStyle & WS_DISABLED &&
-            GetSysColor(COLOR_GRAYTEXT)==lb.lbColor)
+        if (dwStyle & WS_DISABLED && GetSysColor(COLOR_GRAYTEXT)==lb.lbColor)
+        {
+            dprintf(("Disable button"));
             /* don't write gray text on gray background */
             PaintGrayOnGray( hDC,infoPtr->hFont,&rc,text,
                                DT_CENTER | DT_VCENTER );
+        }
         else
         {
+            dprintf(("Enable button"));
             SetTextColor( hDC, (dwStyle & WS_DISABLED) ?
                                  GetSysColor(COLOR_GRAYTEXT) :