Changeset 7500 for trunk/src/user32

Timestamp:

Nov 30, 2001, 2:53:50 PM (24 years ago)

Author:

sandervl

Message:

change menu hilite background color in OS/2 look mode

Location:

trunk/src/user32

Files:

• menu.cpp (modified) (3 diffs)
• oslibwin.cpp (modified) (2 diffs)
• oslibwin.h (modified) (2 diffs)
• syscolor.cpp (modified) (3 diffs)
• syscolor.h (modified) (2 diffs)

trunk/src/user32/menu.cpp

@@ -1 @@
-/* $Id: menu.cpp,v 1.41 2001-11-24 13:55:13 sandervl Exp $*/
+/* $Id: menu.cpp,v 1.42 2001-11-30 13:53:49 sandervl Exp $*/
 /*
  * Menu functions
@@ -36 +36 @@
 #include "win32wmisc.h"
 #include "oslibmsg.h"
+#include "oslibwin.h"
+#include "syscolor.h"
 
 #define DBG_LOCALLOG    DBG_menu
@@ -1150 +1152 @@
 
     if ((lpitem->fState & MF_HILITE) && !(IS_BITMAP_ITEM(lpitem->fType)))
+#ifdef __WIN32OS2__
+            if(fOS2Look) 
+                 FillRect( hdc, &rect, GetOS2ColorBrush(PMSYSCLR_MENUHILITEBGND) );
+            else FillRect( hdc, &rect, GetSysColorBrush(COLOR_HIGHLIGHT) );
+#else
             FillRect( hdc, &rect, GetSysColorBrush(COLOR_HIGHLIGHT) );
+#endif
     else {
         //SvL: TODO: Bug in GDI32; draws black rectangle instead of menu color

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.109 2001-10-15 17:09:03 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.110 2001-11-30 13:53:49 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -1069 +1069 @@
 //******************************************************************************
 //******************************************************************************
+ULONG  OSLibWinQuerySysColor(int index)
+{
+    return CONVERT_RGB(WinQuerySysColor(HWND_DESKTOP, index, 0));
+}
+//******************************************************************************
+//******************************************************************************

trunk/src/user32/oslibwin.h

@@ -1 @@
-/* $Id: oslibwin.h,v 1.61 2001-07-28 13:43:53 sandervl Exp $ */
+/* $Id: oslibwin.h,v 1.62 2001-11-30 13:53:50 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -351 +351 @@
 BOOL   OSLibWinShowPointer(BOOL fShow);
 
+
+   #define PMSYSCLR_SHADOWHILITEBGND         (-50L)
+   #define PMSYSCLR_SHADOWHILITEFGND         (-49L)
+   #define PMSYSCLR_SHADOWTEXT               (-48L)
+   #define PMSYSCLR_ENTRYFIELD               (-47L)
+   #define PMSYSCLR_MENUDISABLEDTEXT         (-46L)
+   #define PMSYSCLR_MENUHILITE               (-45L)
+   #define PMSYSCLR_MENUHILITEBGND           (-44L)
+   #define PMSYSCLR_PAGEBACKGROUND           (-43L)
+   #define PMSYSCLR_FIELDBACKGROUND          (-42L)
+   #define PMSYSCLR_BUTTONLIGHT              (-41L)
+   #define PMSYSCLR_BUTTONMIDDLE             (-40L)
+   #define PMSYSCLR_BUTTONDARK               (-39L)
+   #define PMSYSCLR_BUTTONDEFAULT            (-38L)
+   #define PMSYSCLR_TITLEBOTTOM              (-37L)
+   #define PMSYSCLR_SHADOW                   (-36L)
+   #define PMSYSCLR_ICONTEXT                 (-35L)
+   #define PMSYSCLR_DIALOGBACKGROUND         (-34L)
+   #define PMSYSCLR_HILITEFOREGROUND         (-33L)
+   #define PMSYSCLR_HILITEBACKGROUND         (-32L)
+   #define PMSYSCLR_INACTIVETITLETEXTBGND    (-31L)
+   #define PMSYSCLR_ACTIVETITLETEXTBGND      (-30L)
+   #define PMSYSCLR_INACTIVETITLETEXT        (-29L)
+   #define PMSYSCLR_ACTIVETITLETEXT          (-28L)
+   #define PMSYSCLR_OUTPUTTEXT               (-27L)
+   #define PMSYSCLR_WINDOWSTATICTEXT         (-26L)
+   #define PMSYSCLR_SCROLLBAR                (-25L)
+   #define PMSYSCLR_BACKGROUND               (-24L)
+   #define PMSYSCLR_ACTIVETITLE              (-23L)
+   #define PMSYSCLR_INACTIVETITLE            (-22L)
+   #define PMSYSCLR_MENU                     (-21L)
+   #define PMSYSCLR_WINDOW                   (-20L)
+   #define PMSYSCLR_WINDOWFRAME              (-19L)
+   #define PMSYSCLR_MENUTEXT                 (-18L)
+   #define PMSYSCLR_WINDOWTEXT               (-17L)
+   #define PMSYSCLR_TITLETEXT                (-16L)
+   #define PMSYSCLR_ACTIVEBORDER             (-15L)
+   #define PMSYSCLR_INACTIVEBORDER           (-14L)
+   #define PMSYSCLR_APPWORKSPACE             (-13L)
+   #define PMSYSCLR_HELPBACKGROUND           (-12L)
+   #define PMSYSCLR_HELPTEXT                 (-11L)
+   #define PMSYSCLR_HELPHILITE               (-10L)
+
+   #define PMSYSCLR_CSYSCOLORS               41L
+   #define PMSYSCLR_BASE                     50L
+
+#define CONVERT_RGB(colorRef) ( ((colorRef) & 0x0000FF00     )   |   \
+                                (((colorRef) & 0x00FF0000)>>16)  |   \
+                                (((colorRef) & 0x000000FF)<<16)   )
+
+ULONG  OSLibWinQuerySysColor(int index);
+
 #endif //__OSLIBWIN_H__

trunk/src/user32/syscolor.cpp

@@ -1 @@
-/* $Id: syscolor.cpp,v 1.30 2001-10-15 17:09:04 sandervl Exp $ */
+/* $Id: syscolor.cpp,v 1.31 2001-11-30 13:53:50 sandervl Exp $ */
 
 /*
@@ -24 +24 @@
 #include "syscolor.h"
 #include "options.h"
+#include "oslibwin.h"
 
 #define DBG_LOCALLOG    DBG_syscolor
@@ -266 +267 @@
   return GetStockObject(LTGRAY_BRUSH);
 }
+//******************************************************************************
+HBRUSH OS2SysColorBrush[PMSYSCLR_CSYSCOLORS] = {0};
+//******************************************************************************
+HBRUSH WIN32API GetOS2ColorBrush(int nIndex)
+{
+  dprintf(("GetOS2ColorBrush %d", nIndex));
+  nIndex += PMSYSCLR_BASE;
+  if( ((nIndex < 0) || (nIndex >= PMSYSCLR_CSYSCOLORS))  ) {
+      DebugInt3();
+      return 0;
+  }
+
+  if(OS2SysColorBrush[nIndex]) return OS2SysColorBrush[nIndex];
+
+  ULONG color = OSLibWinQuerySysColor(nIndex-PMSYSCLR_BASE);
+  dprintf(("color %x", color));
+  OS2SysColorBrush[nIndex] = CreateSolidBrush(color);
+
+  return OS2SysColorBrush[nIndex];
+}
 /***********************************************************************
  * This function is new to the Wine lib -- it does not exist in

trunk/src/user32/syscolor.h

@@ -1 @@
-/* $Id: syscolor.h,v 1.14 2001-06-10 12:05:40 sandervl Exp $ */
+/* $Id: syscolor.h,v 1.15 2001-11-30 13:53:50 sandervl Exp $ */
 
 /*
@@ -12 +12 @@
 #define __WINE_SYSCOLOR_H
 
-BOOL   WIN32API OS2UpdateWindow(HWND hwnd);
-HBRUSH WIN32API OS2GetSysColorBrush(int nIndex);
+HBRUSH WIN32API GetOS2ColorBrush(int nIndex);
 
 extern void SYSCOLOR_Init(int fOverride = -1);