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

Timestamp:

Feb 27, 2003, 3:22:45 PM (22 years ago)

Author:

sandervl

Message:

PF: Illegal PM sequence of maximizing from icon state corrected. Inter-thread controls change caused PM lockups. Rewrote PM window frame controls manipulation procedure

File:

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

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.200 2003-02-22 09:54:25 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.201 2003-02-27 14:22:43 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -707 +707 @@
         break;
 
+    case WIN32APP_CHNGEFRAMECTRLS:
+    {
+      dprintf(("OS2: WIN32APP_CHANGEFRAMECTRLS"));
+      OSLibSetWindowStyle(win32wnd->getOS2FrameWindowHandle(), win32wnd->getOS2WindowHandle(), (ULONG)mp1, win32wnd->getExStyle(), (ULONG)mp2);
+      break;
+    }
+
     case WM_SETFOCUS:
     {
@@ -1328 +1335 @@
         if(win32wnd->getOldStyle() != win32wnd->getStyle())
         {
-             OSLibSetWindowStyle(win32wnd->getOS2FrameWindowHandle(), win32wnd->getOS2WindowHandle(), win32wnd->getStyle(), win32wnd->getExStyle());
+             OSLibSetWindowStyle(win32wnd->getOS2FrameWindowHandle(), win32wnd->getOS2WindowHandle(), win32wnd->getStyle(), win32wnd->getExStyle(), win32wnd->getStyle());
              if(fOS2Look) {
                  DWORD dwOldStyle = win32wnd->getOldStyle();
                  DWORD dwStyle    = win32wnd->getStyle();
-
+    
                  win32wnd->setOldStyle(dwStyle);
                  if((dwOldStyle & WS_MINIMIZE_W) && !(dwStyle & WS_MINIMIZE_W)) {
@@ -1340 +1347 @@
                      if(dwStyle & WS_MAXIMIZE_W) {
                          //SC_MAXIMIZE -> SC_RESTORE
-                         dprintf(("%x -> SC_MAXIMIZE -> SC_RESTORE", win32wnd->getWindowHandle()));
+                         dprintf(("%x -> SC_MAXIMIZE -> SC_RESTORE (1)", win32wnd->getWindowHandle()));
                          FrameReplaceMenuItem(WinWindowFromID(hwnd, FID_MINMAX), MIT_END, SC_MAXIMIZE, SC_RESTORE, hbmFrameMenu[PMMENU_RESTOREBUTTON]);
                      }
@@ -1359 +1366 @@
                  if(!(dwOldStyle & WS_MAXIMIZE_W) && (dwStyle & WS_MAXIMIZE_W)) {
                      //SC_MAXIMIZE -> SC_RESTORE
-                     dprintf(("%x -> SC_MAXIMIZE -> SC_RESTORE", win32wnd->getWindowHandle()));
+                     dprintf(("%x -> SC_MAXIMIZE -> SC_RESTORE (2)", win32wnd->getWindowHandle()));
                      FrameReplaceMenuItem(WinWindowFromID(hwnd, FID_MINMAX), MIT_END, SC_MAXIMIZE, SC_RESTORE, hbmFrameMenu[PMMENU_RESTOREBUTTON]);
                  }
@@ -2077 +2084 @@
         WinSendMsg(hwndMenu, MM_INSERTITEM, (MPARAM)&mi, 0);
     }
+    else
+     dprintf(("WARNING: FrameReplaceMenuItem control %x not found",idOld));
+
     WinEnableWindowUpdate(hwndMenu, TRUE);