Changeset 9605 for trunk/src/user32/pmwindow.cpp

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/pmwindow.cpp (modified) (6 diffs)

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();
     }