Changeset 9605 for trunk/src

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)

Location:

trunk/src/user32

Files:

• menu.c (modified) (6 diffs)
• pmwindow.cpp (modified) (6 diffs)
• syscolor.cpp (modified) (2 diffs)
• syscolor.h (modified) (2 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 );

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.191 2002-12-04 15:23:39 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.192 2003-01-03 21:43:15 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -53 +53 @@
 #include <win\dbt.h>
 #include "dragdrop.h"
+#include "menu.h"
 
 #define DBG_LOCALLOG    DBG_pmwindow
@@ -240 +241 @@
     if(fOS2Look)
     {
+#if 0
         SYSCOLOR_Init(FALSE); //use OS/2 colors
+#endif
         QueryPMMenuBitmaps();
     }
@@ -297 +300 @@
         hbmFrameMenu[PMMENU_CLOSEBUTTONDOWN] = GpiLoadBitmap(hdc, hModDisplay, SBMP_CLOSEDEP, 0, 0);
 
-#ifdef NEW_WGSS
         //Create win32 bitmap handles of the OS/2 min, max and restore buttons
         hBmpMinButton     = O32_CreateBitmapFromPMHandle(hbmFrameMenu[PMMENU_MINBUTTON]);
@@ -307 +309 @@
         hBmpCloseButton   = O32_CreateBitmapFromPMHandle(hbmFrameMenu[PMMENU_CLOSEBUTTON]);
         hBmpCloseButtonDown   = O32_CreateBitmapFromPMHandle(hbmFrameMenu[PMMENU_CLOSEBUTTONDOWN]);
-#endif
         DevCloseDC(hdc);
     }
 }
-//******************************************************************************
-//menu.cpp
-BOOL MENU_Init();
 //******************************************************************************
 //******************************************************************************
@@ -320 +318 @@
     if(fLooks == OS2_APPEARANCE || fLooks == OS2_APPEARANCE_SYSMENU)
     {
+#if 0
         SYSCOLOR_Init(FALSE); //use OS/2 colors
+#endif
         QueryPMMenuBitmaps();
     }

trunk/src/user32/syscolor.cpp

@@ -1 @@
-/* $Id: syscolor.cpp,v 1.34 2002-11-29 15:46:34 sandervl Exp $ */
+/* $Id: syscolor.cpp,v 1.35 2003-01-03 21:43:16 sandervl Exp $ */
 
 /*
@@ -292 +292 @@
   return OS2SysColorBrush[nIndex];
 }
+//******************************************************************************
+//******************************************************************************
+COLORREF WIN32API GetOS2Color(int nIndex) 
+{
+  nIndex += PMSYSCLR_BASE;
+  if( ((nIndex < 0) || (nIndex >= PMSYSCLR_CSYSCOLORS))  ) {
+      DebugInt3();
+      return 0;
+  }
+  return OSLibWinQuerySysColor(nIndex-PMSYSCLR_BASE);
+}
 /***********************************************************************
  * This function is new to the Wine lib -- it does not exist in

trunk/src/user32/syscolor.h

@@ -1 @@
-/* $Id: syscolor.h,v 1.15 2001-11-30 13:53:50 sandervl Exp $ */
+/* $Id: syscolor.h,v 1.16 2003-01-03 21:43:17 sandervl Exp $ */
 
 /*
@@ -13 +13 @@
 
 HBRUSH WIN32API GetOS2ColorBrush(int nIndex);
+COLORREF WIN32API GetOS2Color(int nIndex);
 
 extern void SYSCOLOR_Init(int fOverride = -1);