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

Timestamp:

Jan 3, 2003, 10:43:17 PM (23 years ago)

Author:

sandervl

Message:

Always use windows system colors (even in OS/2 L&F mode)

File:

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

trunk/src/user32/menu.c

@@ -46 +46 @@
 
 HBRUSH WIN32API GetOS2ColorBrush(int nIndex);
+COLORREF WIN32API GetOS2Color(int nIndex);
 
 static BOOL fDisableOdinSysMenuItems = FALSE;
@@ -1238 +1239 @@
                     DrawEdge(hdc, &rect, BDR_SUNKENOUTER, BF_RECT);
                 else
-#ifdef __WIN32OS2__
-                    if(fOS2Look) 
+#if 0 //def __WIN32OS2__
+                    if(!fOS2Look) 
                          FillRect( hdc, &rect, GetOS2ColorBrush(PMSYSCLR_MENUHILITEBGND) );
                     else FillRect( hdc, &rect, GetSysColorBrush(COLOR_HIGHLIGHT) );
@@ -1313 +1314 @@
                 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
             }
         }
@@ -1359 +1366 @@
                 BitBlt( hdc, rect.left, (y - check_bitmap_height) / 2,
                         check_bitmap_width, check_bitmap_height,
-#ifdef __WIN32OS2__
-                        //how can SRCCOPY work in Wine??
-                        hdcMem, 0, 0, (lpitem->fState & MF_HILITE) ? MERGEPAINT : SRCAND );
-#else
                         hdcMem, 0, 0, SRCCOPY );
-#endif
                 DeleteDC( hdcMem );
             }
@@ -1378 +1380 @@
                                   DFCS_MENUBULLET : DFCS_MENUCHECK );
                 BitBlt( hdc, rect.left, (y - r.bottom) / 2, r.right, r.bottom,
-#ifdef __WIN32OS2__
-                        //how can SRCCOPY work in Wine??
-                        hdcMem, 0, 0, (lpitem->fState & MF_HILITE) ? MERGEPAINT : SRCAND );
-#else
                         hdcMem, 0, 0, SRCCOPY );
-#endif
                 DeleteDC( hdcMem );
                 DeleteObject( bm );
@@ -1399 +1396 @@
                       (y - arrow_bitmap_height) / 2,
                       arrow_bitmap_width, arrow_bitmap_height,
-#ifdef __WIN32OS2__
-                      //how can SRCCOPY work in Wine??
-                      hdcMem, 0, 0, (lpitem->fState & MF_HILITE) ? MERGEPAINT : SRCAND );
-#else
                       hdcMem, 0, 0, SRCCOPY );
-#endif
             SelectObject( hdcMem, hOrigBitmap );
             DeleteDC( hdcMem );