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

Timestamp:

Feb 9, 2001, 7:30:25 PM (25 years ago)

Author:

sandervl

Message:

WM_MINIMIZE/WS_MAXIMIZE support added to CreateWindow

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.232 2001-02-03 18:52:02 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.233 2001-02-09 18:30:25 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -375 +375 @@
         if (fCXDefault)
         {
-        fCXDefault = FALSE;
-        cs->cx = cs->cy = 0;
+            fCXDefault = FALSE;
+            cs->cx = cs->cy = 0;
         }
     }
@@ -705 +705 @@
                 SendInternalMessageA(WM_MOVE,0,MAKELONG(rectClient.left,rectClient.top));
             }
+            if (getStyle() & (WS_MINIMIZE | WS_MAXIMIZE))
+            {
+                        RECT newPos;
+                        UINT swFlag = (getStyle() & WS_MINIMIZE) ? SW_MINIMIZE : SW_MAXIMIZE;
+                setStyle(getStyle() & ~(WS_MAXIMIZE | WS_MINIMIZE));
+                        MinMaximize(swFlag, &newPos);
+                swFlag = ((getStyle() & WS_CHILD) || GetActiveWindow()) ? SWP_NOACTIVATE | SWP_NOZORDER | SWP_FRAMECHANGED
+                                                                        : SWP_NOZORDER | SWP_FRAMECHANGED;
+                SetWindowPos(0, newPos.left, newPos.top,  newPos.right, newPos.bottom, swFlag);
+            }
+
             if( (getStyle() & WS_CHILD) && !(getExStyle() & WS_EX_NOPARENTNOTIFY) )
             {
@@ -1358 +1369 @@
         if (lParam)
         {
-          wndNameLength = strlen(lpsz);
-          windowNameA = (LPSTR)_smalloc(wndNameLength+1);
-          strcpy(windowNameA, lpsz);
-          windowNameW = (LPWSTR)_smalloc((wndNameLength+1)*sizeof(WCHAR));
-          lstrcpyAtoW(windowNameW, windowNameA);
+            wndNameLength = strlen(lpsz);
+            windowNameA = (LPSTR)_smalloc(wndNameLength+1);
+            strcpy(windowNameA, lpsz);
+            windowNameW = (LPWSTR)_smalloc((wndNameLength+1)*sizeof(WCHAR));
+            lstrcpyAtoW(windowNameW, windowNameA);
         }
         else
         {
-          windowNameA = NULL;
-          windowNameW = NULL;
-          wndNameLength = 0;
+            windowNameA = NULL;
+            windowNameW = NULL;
+            wndNameLength = 0;
         }
         dprintf(("WM_SETTEXT of %x to %s\n", Win32Hwnd, lParam));
         if ((dwStyle & WS_CAPTION) == WS_CAPTION)
         {
-          HandleNCPaint((HRGN)1);
-          if(hTaskList) {
-        OSLibWinChangeTaskList(hTaskList, OS2Hwnd, getWindowNameA(), (getStyle() & WS_VISIBLE) ? 1 : 0);
-      }
+            HandleNCPaint((HRGN)1);
+            if(hTaskList) {
+                OSLibWinChangeTaskList(hTaskList, OS2Hwnd, getWindowNameA(), (getStyle() & WS_VISIBLE) ? 1 : 0);
+            }
         }
 
@@ -1384 +1395 @@
     case WM_SETREDRAW:
     {
-      if (wParam)
-      {
-        setStyle(getStyle() | WS_VISIBLE);
-        OSLibWinEnableWindowUpdate(OS2Hwnd,TRUE);
-      }
-      else
-      {
-        if (getStyle() & WS_VISIBLE)
-        {
-          setStyle(getStyle() & ~WS_VISIBLE);
-          OSLibWinEnableWindowUpdate(OS2Hwnd,FALSE);
-        }
-      }
-      return 0;
+        if (wParam)
+        {
+            setStyle(getStyle() | WS_VISIBLE);
+            OSLibWinEnableWindowUpdate(OS2Hwnd,TRUE);
+        }
+        else
+        {
+            if (getStyle() & WS_VISIBLE)
+            {
+                setStyle(getStyle() & ~WS_VISIBLE);
+                OSLibWinEnableWindowUpdate(OS2Hwnd,FALSE);
+            }
+        }
+        return 0;
     }
 
@@ -3316 +3327 @@
                 }
                 dprintf(("WARNING: SetWindowLong%c %x %d %x returned %x INVALID index!", (fUnicode) ? 'W' : 'A', getWindowHandle(), index, value));
-                SetLastError(ERROR_INVALID_INDEX);      //verified in NT4, SP6
+                SetLastError(ERROR_INVALID_INDEX);  //verified in NT4, SP6
                 return 0;
     }
@@ -3358 +3369 @@
             break;
         }
-        SetLastError(ERROR_INVALID_INDEX);      //verified in NT4, SP6
+        SetLastError(ERROR_INVALID_INDEX);  //verified in NT4, SP6
         return 0;
     }
@@ -3380 +3391 @@
         return oldval;
     }
-    SetLastError(ERROR_INVALID_INDEX);  //verified in NT4, SP6
+    SetLastError(ERROR_INVALID_INDEX);  //verified in NT4, SP6
     return 0;
 }
@@ -3393 +3404 @@
         return ((WORD *)userWindowLong)[index/2];
     }
-    SetLastError(ERROR_INVALID_INDEX);  //verified in NT4, SP6
+    SetLastError(ERROR_INVALID_INDEX);  //verified in NT4, SP6
     return 0;
 }