Changeset 9866 for trunk/src/user32/win32wbase.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/win32wbase.cpp (modified) (4 diffs)

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.359 2003-02-17 13:40:11 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.360 2003-02-27 14:22:44 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -3760 +3760 @@
                 setExStyle(ss.styleNew);
                 SendMessageA(getWindowHandle(),WM_STYLECHANGED,GWL_EXSTYLE,(LPARAM)&ss);
-                OSLibSetWindowStyle(getOS2FrameWindowHandle(), getOS2WindowHandle(), getStyle(), getExStyle());
+
+                OSLibSetWindowStyle(getOS2FrameWindowHandle(), getOS2WindowHandle(), 
+                                    getStyle(), getExStyle(),ss.styleOld);
+
                 oldval = ss.styleOld;
                 break;
@@ -3767 +3770 @@
         {
                 STYLESTRUCT ss;
-
+ 
                 //SvL: TODO: Can you change minimize or maximize status here too?
 
@@ -3782 +3785 @@
                 setStyle(ss.styleNew);
                 SendMessageA(getWindowHandle(),WM_STYLECHANGED,GWL_STYLE,(LPARAM)&ss);
-                OSLibSetWindowStyle(getOS2FrameWindowHandle(), getOS2WindowHandle(), 
-                                    getStyle(), getExStyle());
+
+                 OSLibSetWindowStyle(getOS2FrameWindowHandle(), getOS2WindowHandle(), 
+                                    getStyle(), getExStyle(),ss.styleOld);
 
                 //TODO: Might not be correct to use ShowWindow here