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

Timestamp:

Feb 6, 2003, 9:28:42 PM (23 years ago)

Author:

sandervl

Message:

Send WM_QUERYNEWPALETTE when a window receives focus; translate WM_REALIZEPALETTE into WM_PALETTECHANGED

File:

• trunk/src/user32/pmwindow.cpp (modified) (7 diffs)

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.194 2003-01-29 13:07:30 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.195 2003-02-06 20:28:39 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -257 +257 @@
 } /* End of main */
 //******************************************************************************
-#ifdef NEW_WGSS
 HBITMAP OPEN32API _O32_CreateBitmapFromPMHandle(HBITMAP hPMBitmap);
 
@@ -270 +269 @@
     return yyrc;
 }
-#endif
 //******************************************************************************
 static void QueryPMMenuBitmaps()
@@ -300 +298 @@
         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]);
@@ -310 +307 @@
         hBmpCloseButton   = O32_CreateBitmapFromPMHandle(hbmFrameMenu[PMMENU_CLOSEBUTTON]);
         hBmpCloseButtonDown   = O32_CreateBitmapFromPMHandle(hbmFrameMenu[PMMENU_CLOSEBUTTONDOWN]);
-#endif
         DevCloseDC(hdc);
     }
@@ -881 +877 @@
     case WM_REALIZEPALETTE:
     {
-        dprintf(("OS2: WM_REALIZEPALETTE"));
-        goto RunDefWndProc;
+        dprintf(("OS2: WM_REALIZEPALETTE %x", win32wnd->getWindowHandle()));
+        win32wnd->DispatchMsgA(pWinMsg);
+        break;
     }
 
@@ -1577 +1574 @@
                     //    -> problems with update region if we don't do it
                     //       todo: rewrite whole handling
+                    dprintf(("PMFRAME: WM_WINDOWPOSCHANGED invalidate all"));
                     WinInvalidateRect(hwnd,NULL,TRUE);
                 }