Changeset 9607 for trunk/src/user32/menu.c

Timestamp:

Jan 4, 2003, 1:21:44 PM (23 years ago)

Author:

sandervl

Message:

fix for alt key & menu activation; fixed color of highlighted menubar item

File:

• trunk/src/user32/menu.c (modified) (3 diffs)

trunk/src/user32/menu.c

@@ -1234 +1234 @@
         if (lpitem->fState & MF_HILITE)
         {
+#ifdef __WIN32OS2__
+            if(!fOS2Look) 
+#else
             if(TWEAK_WineLook == WIN98_LOOK)
+#endif
             {
                 if(menuBar)
                     DrawEdge(hdc, &rect, BDR_SUNKENOUTER, BF_RECT);
                 else
-#if 0 //def __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 /* Not Win98 Look */
@@ -1304 +1302 @@
     if (lpitem->fState & MF_HILITE)
     {
+#ifdef __WIN32OS2__
+        if(!fOS2Look) 
+#else
         if(TWEAK_WineLook == WIN98_LOOK)
+#endif
         {
             if(menuBar) {
@@ -1314 +1316 @@
                 else
                     SetTextColor(hdc, GetSysColor(COLOR_HIGHLIGHTTEXT));
-#if 0 //def __WIN32OS2__
-                if(!fOS2Look) 
-                     SetBkColor(hdc, GetOS2Color(PMSYSCLR_MENUHILITEBGND));
-                else SetBkColor(hdc, GetSysColor(COLOR_HIGHLIGHT));
-#else
                 SetBkColor(hdc, GetSysColor(COLOR_HIGHLIGHT));
-#endif
             }
         }