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

Timestamp:

May 2, 2000, 10:50:53 PM (25 years ago)

Author:

sandervl

Message:

RDW_FRAME support for GetDCEx; added wine dialog change; added extra logging

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.181 2000-04-29 18:28:39 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.182 2000-05-02 20:50:51 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -2113 +2113 @@
         return TRUE;
     }
+#if 0
+    /* Fix redundant flags */
+    if(getStyle() & WS_VISIBLE) {
+        fuFlags &= ~SWP_SHOWWINDOW;
+    }
+    else
+    {
+        if (!(fuFlags & SWP_SHOWWINDOW)) 
+              fuFlags |= SWP_NOREDRAW;
+        fuFlags &= ~SWP_HIDEWINDOW;
+    }
+
+    if(cx < 0) cx = 0; 
+    if(cy < 0) cy = 0;
+
+    if((rectWindow.right - rectWindow.left == cx) && (rectWindow.bottom - rectWindow.top == cy)) {
+        fuFlags |= SWP_NOSIZE;    /* Already the right size */
+    }
+
+    if((rectWindow.left == x) && (rectWindow.top == y)) {
+        fuFlags |= SWP_NOMOVE;    /* Already the right position */
+    }
+
+    if(getWindowHandle() == GetActiveWindow()) {
+        fuFlags |= SWP_NOACTIVATE;   /* Already active */
+    }
+    else 
+    if((getStyle() & (WS_POPUP | WS_CHILD)) != WS_CHILD )
+    {
+        if(!(fuFlags & SWP_NOACTIVATE)) /* Bring to the top when activating */
+        {
+            fuFlags &= ~SWP_NOZORDER;
+            hwndInsertAfter = HWND_TOP;           
+        }
+    }
+#endif
+
     WINDOWPOS wpos;
     SWP swp, swpOld;
@@ -2196 +2233 @@
         FrameUpdateClient(this);
     }
-
     return (rc);
 }