Changeset 1391 for trunk/src/user32/win32wbasepos.cpp

Timestamp:

Oct 21, 1999, 2:19:29 PM (26 years ago)

Author:

sandervl

Message:

wm_adjustwindowpos & combobox fixes

File:

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

trunk/src/user32/win32wbasepos.cpp

@@ -1 @@
-/* $Id: win32wbasepos.cpp,v 1.4 1999-10-20 13:46:28 sandervl Exp $ */
+/* $Id: win32wbasepos.cpp,v 1.5 1999-10-21 12:19:29 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2 (nonclient/position methods)
@@ -426 +426 @@
 {
  POINT maxSize, minTrack;
+ int   rc = 1;
 
     if (winpos->flags & SWP_NOSIZE)
@@ -431 +432 @@
 
     if ((getStyle() & WS_THICKFRAME) ||
-            ((getStyle() & (WS_POPUP | WS_CHILD)) == 0))
-    {
-            GetMinMaxInfo(&maxSize, NULL, &minTrack, NULL );
-            if (maxSize.x < winpos->cx) winpos->cx = maxSize.x;
-            if (maxSize.y < winpos->cy) winpos->cy = maxSize.y;
-            if (!(getStyle() & WS_MINIMIZE))
-            {
-            if (winpos->cx < minTrack.x ) winpos->cx = minTrack.x;
-            if (winpos->cy < minTrack.y ) winpos->cy = minTrack.y;
-        }
-        return 0;
+        ((getStyle() & (WS_POPUP | WS_CHILD)) == 0))
+    {
+        GetMinMaxInfo(&maxSize, NULL, &minTrack, NULL );
+        if (maxSize.x < winpos->cx) {
+            winpos->cx = maxSize.x;
+            rc = 0;
+        }
+        if (maxSize.y < winpos->cy) {
+            winpos->cy = maxSize.y;
+            rc = 0;
+        }
+        if (!(getStyle() & WS_MINIMIZE))
+        {
+            if (winpos->cx < minTrack.x ) {
+                winpos->cx = minTrack.x;
+                rc = 0;
+            }
+            if (winpos->cy < minTrack.y ) {
+                winpos->cy = minTrack.y;
+                rc = 0;
+            }
+        }
     }
-    return 1;
+    return rc;
 }
 //******************************************************************************