Changeset 10145 for trunk/src/user32/window.cpp

Timestamp:

Jun 25, 2003, 7:02:04 PM (22 years ago)

Author:

sandervl

Message:

PF: ShowWindow(SW_RESTORE) should start the same PM restoration routine as WM_SYSCOMMAND

File:

• trunk/src/user32/window.cpp (modified) (3 diffs)

trunk/src/user32/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.135 2003-06-03 11:58:38 sandervl Exp $ */
+/* $Id: window.cpp,v 1.136 2003-06-25 17:02:04 sandervl Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -37 +37 @@
 #include "user32.h"
 #include "winicon.h"
+#include "pmwindow.h"
 #include "oslibmsg.h"
 #include <win\winpos.h>
@@ -519 +520 @@
         return 0;
     }
-    ret = window->ShowWindow(nCmdShow);
+
+    //PF Start PM restoration routine first if we restore from icon
+    //so all internal PM logic will work - this routine will always
+    //lead to ShowWindow(SW_RESTORE)
+
+    if ((nCmdShow == SW_RESTORE) && (window->getStyle() & WS_MINIMIZE) && fOS2Look )
+    {
+        dprintf(("ShowWindow: Initiating OS/2 PM restore"));          
+        ret = OSLibWinRestoreWindow(window->getOS2FrameWindowHandle());
+    }
+    else   
+        ret = window->ShowWindow(nCmdShow);
     RELEASE_WNDOBJ(window);
     return ret;