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

Timestamp:

Nov 5, 2000, 7:49:09 PM (25 years ago)

Author:

sandervl

Message:

extra exports for gdi32; moved 4 apis back into gdi32

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.220 2000-10-23 18:28:53 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.221 2000-11-05 18:49:07 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -95 +95 @@
   fParentDC        = FALSE;
   fComingToTop     = FALSE;
+  fCreateSetWindowPos = FALSE;
 
   windowNameA      = NULL;
@@ -639 +640 @@
   }
 
-  //preset rects
+  //set client & window rectangles from CreateWindowEx CREATESTRUCT
   rectWindow.left = cs->x;
   rectWindow.right = cs->x+cs->cx;
   rectWindow.top = cs->y;
   rectWindow.bottom = cs->y+cs->cy;
-  rectClient = rectWindow; //dummy client rect
+  rectClient = rectWindow;
   OffsetRect(&rectClient, -rectClient.left, -rectClient.top);
 
@@ -673 +674 @@
                 fCXDefault = FALSE;
                 cs->cx = cs->cy = 0;
+                rectWindow.right  = rectWindow.left;
+                rectWindow.bottom = rectWindow.top;
             }
         }
-        //update rect
-        rectWindow.left = cs->x;
-        rectWindow.right = cs->x+cs->cx;
-        rectWindow.top = cs->y;
-        rectWindow.bottom = cs->y+cs->cy;
         tmpRect = rectWindow;
 
-        rectClient = rectWindow;
-        OffsetRect(&rectClient, -rectClient.left, -rectClient.top);
-        OffsetRect(&rectWindow, maxPos.x - rectWindow.left, maxPos.y - rectWindow.top);
+        fCreateSetWindowPos = TRUE;
 
         //set the window size and update the client
@@ -2266 +2262 @@
     }
 #endif
+
+    if(!fCreateSetWindowPos)
+    {//don't change size; modify internal structures only
+        //TODO: not 100% correct yet (activate)
+        if(!(fuFlags & SWP_NOZORDER)) {
+            hwndLinkAfter = hwndInsertAfter;
+        }
+        if(!(fuFlags & SWP_NOMOVE)) {
+            rectWindow.bottom = (rectWindow.bottom - rectWindow.top) + y;
+            rectWindow.top    = y;
+            rectWindow.right  = (rectWindow.right - rectWindow.left) + x;
+            rectWindow.left   = x;
+        }
+        if(!(fuFlags & SWP_NOSIZE)) {
+            rectWindow.bottom = rectWindow.top + cy;
+            rectWindow.right  = rectWindow.left + cx;
+        }
+        return TRUE;
+    }
 
     WINDOWPOS wpos;