Changeset 1337 for trunk/src/user32/win32wbase.cpp

Timestamp:

Oct 17, 1999, 6:42:40 PM (26 years ago)

Author:

sandervl

Message:

Implemented SetWindowPlacement + bugfixes

File:

• trunk/src/user32/win32wbase.cpp (modified) (13 diffs)

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.49 1999-10-17 15:46:09 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.50 1999-10-17 16:42:39 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -726 +726 @@
     if (isSubclassedOS2Wnd) OSLibWinSubclassWindow(OS2Hwnd,pOldWndProc);
 
+    fIsDestroyed = TRUE;
     //According to the SDK, WM_PARENTNOTIFY messages are sent to the parent (this window)
     //before any window destruction has begun
@@ -739 +740 @@
     if (hwndVertScroll && OSLibWinQueryWindow(hwndVertScroll,QWOS_PARENT) == OSLIB_HWND_OBJECT) OSLibWinDestroyWindow(hwndVertScroll);
 
-    fIsDestroyed = TRUE;
     if(getFirstChild() == NULL) {
         delete this;
@@ -846 +846 @@
  WORD fwSizeType = 0;
 
+    dwStyle &= ~(WS_MINIMIZE|WS_MAXIMIZE);
     if(fMinimize) {
             fwSizeType = SIZE_MINIMIZED;
+            dwStyle |= WS_MINIMIZE;
     }
     else
     if(fMaximize) {
             fwSizeType = SIZE_MAXIMIZED;
+            dwStyle |= WS_MAXIMIZE;
     }
     else    fwSizeType = SIZE_RESTORED;
@@ -1005 +1008 @@
                                                     // bit 24, 1=extended key
                                                     // bit 25-28, reserved
-                                            // bit 29, key is released, always 1 for WM_SYSKEYUP ?? <- conflict according to the MS docs
+                                                    // bit 29, key is released, always 1 for WM_SYSKEYUP ?? <- conflict according to the MS docs
     if (keyWasPressed)
         lParam |= 1 << 30;                          // bit 30, previous state, 1 means key was pressed
@@ -1884 +1887 @@
     {
         /* should happen only in CreateWindowEx() */
-        int wParam = SIZE_RESTORED;
-
-            flags &= ~WIN_NEED_SIZE;
-            if (dwStyle & WS_MAXIMIZE)
-                wParam = SIZE_MAXIMIZED;
-            else
-            if (dwStyle & WS_MINIMIZE)
-                wParam = SIZE_MINIMIZED;
-        
+        int wParam = SIZE_RESTORED;
+
+        flags &= ~WIN_NEED_SIZE;
+        if (dwStyle & WS_MAXIMIZE)
+            wParam = SIZE_MAXIMIZED;
+        else
+        if (dwStyle & WS_MINIMIZE)
+            wParam = SIZE_MINIMIZED;
+
         SendMessageA(WM_SIZE, wParam,
                      MAKELONG(rectClient.right-rectClient.left,
@@ -2045 +2048 @@
 }
 //******************************************************************************
+//TODO: WPF_RESTOREMAXIMIZED
+//******************************************************************************
+BOOL Win32BaseWindow::SetWindowPlacement(WINDOWPLACEMENT *winpos)
+{
+   if(isFrameWindow())
+   {
+      // Set the minimized position
+      if (winpos->flags & WPF_SETMINPOSITION)
+      {
+         OSLibSetWindowMinPos(OS2HwndFrame, winpos->ptMinPosition.x, winpos->ptMinPosition.y);
+      }
+
+      //TODO: Max position
+
+      // Set the new restore position.
+      OSLibSetWindowRestoreRect(OS2HwndFrame, &winpos->rcNormalPosition);
+   }
+
+   return ShowWindow(winpos->showCmd);
+}
+//******************************************************************************
 //Also destroys all the child windows (destroy parent, destroy children)
 //******************************************************************************
@@ -2247 +2271 @@
         }
         break;
-        
+
     case GW_HWNDLAST:
         if(getParent())
@@ -2261 +2285 @@
         hwndRelated = window->getWindowHandle();
         break;
-        
+
     case GW_HWNDNEXT:
         window = (Win32BaseWindow *)getNextChild();
@@ -2268 +2292 @@
         }
         break;
-        
+
     case GW_HWNDPREV:
         if(!getParent())
@@ -2290 +2314 @@
         }
         break;
-                
+
     case GW_OWNER:
         if(getOwner()) {
@@ -2446 +2470 @@
                 ss.styleOld = dwExStyle;
                 ss.styleNew = value;
-        dprintf(("SetWindowLong GWL_EXSTYLE %x new style %x", getWindowHandle(), value));
+                dprintf(("SetWindowLong GWL_EXSTYLE %x new style %x", getWindowHandle(), value));
                 SendMessageA(WM_STYLECHANGING,GWL_EXSTYLE,(LPARAM)&ss);
                 setExStyle(ss.styleNew);
@@ -2458 +2482 @@
                 ss.styleOld = dwStyle;
                 ss.styleNew = value;
-        dprintf(("SetWindowLong GWL_STYLE %x new style %x", getWindowHandle(), value));
+                dprintf(("SetWindowLong GWL_STYLE %x new style %x", getWindowHandle(), value));
                 SendMessageA(WM_STYLECHANGING,GWL_STYLE,(LPARAM)&ss);
                 setStyle(ss.styleNew);
-                OSLibSetWindowStyle(OS2HwndFrame, dwStyle);
+                if(!IsWindowDestroyed())
+                    OSLibSetWindowStyle(OS2HwndFrame, dwStyle);
                 SendMessageA(WM_STYLECHANGED,GWL_STYLE,(LPARAM)&ss);
                 return ss.styleOld;