Changeset 11799

Timestamp:

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

Author:

sandervl

Message:

Syscolor + button WM_ENABLE fixes

Location:

tags/trunk/src/user32

Files:

• button.cpp (modified) (4 diffs)
• pmwindow.cpp (modified) (2 diffs)
• syscolor.cpp (modified) (5 diffs)

tags/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) :

tags/trunk/src/user32/pmwindow.cpp ¶

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.22 1999-10-08 14:57:17 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.23 1999-10-09 11:03:23 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -220 +220 @@
     case WM_ENABLE:
         dprintf(("OS2: WM_ENABLE %x", hwnd));
-        if(win32wnd->MsgEnable((ULONG)mp1)) {
+        if(win32wnd->MsgEnable(SHORT1FROMMP(mp1))) {
                 goto RunDefWndProc;
         }

tags/trunk/src/user32/syscolor.cpp ¶

@@ -1 @@
-/* $Id: syscolor.cpp,v 1.8 1999-10-05 16:53:49 cbratschi Exp $ */
+/* $Id: syscolor.cpp,v 1.9 1999-10-09 11:03:23 sandervl Exp $ */
 
 /*
@@ -21 +21 @@
 #include "user32.h"
 #include "syscolor.h"
+
+//SvL: Open32 colors are much better than those in the table below
+#define NUM_OPEN32_SYSCOLORS 21
 
 #define NUM_SYS_COLORS     (COLOR_GRADIENTINACTIVECAPTION+1)
@@ -107 +110 @@
 
   SYSCOLOR_Load();
-  for (x = 0;x < NUM_SYS_COLORS;x++) SYSCOLOR_SetColor(x,SysColors[x]);
+  for (x = 0;x < NUM_SYS_COLORS;x++) {
+        if(x < NUM_OPEN32_SYSCOLORS)
+                SYSCOLOR_SetColor(x,O32_GetSysColor(x));
+        else    SYSCOLOR_SetColor(x,SysColors[x]);
+  }
 }
 //******************************************************************************
@@ -119 +126 @@
   }
 
-  if (nIndex >= 0 && nIndex < NUM_SYS_COLORS) return SysColors[nIndex];
+  if (nIndex >= 0 && nIndex < NUM_SYS_COLORS) 
+  {
+        if(nIndex < NUM_OPEN32_SYSCOLORS)
+                return O32_GetSysColor(nIndex);
+        else    return SysColors[nIndex];
+  }
   else return 0;
 }
@@ -138 +150 @@
     WriteLog("OS2SetSysColors\n");
 #endif
+    
+    O32_SetSysColors(nChanges, lpSysColor, lpColorValues);
 
     for(i=0;i<nChanges;i++) {