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

Timestamp:

Sep 25, 1999, 11:27:08 AM (26 years ago)

Author:

dengert

Message:

fixed ClientToScreen adn ScreenToClient

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.10 1999-09-24 22:45:27 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.11 1999-09-25 09:27:07 dengert Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -1242 +1242 @@
         WPARAM     wp   = SIZE_RESTORED;
 
-        if (!(wpos->flags & SWP_NOCLIENTMOVE))
+        if (!(wpos->flags & SWP_NOMOVE) && !(wpos->flags & SWP_NOCLIENTMOVE))
             SendMessageA(WM_MOVE, 0, MAKELONG(rectClient.left, rectClient.top));
 
-        if (!(wpos->flags & SWP_NOCLIENTSIZE))
+        if (!(wpos->flags & SWP_NOSIZE) && !(wpos->flags & SWP_NOCLIENTSIZE))
         {
             if (dwStyle & WS_MAXIMIZE) wp = SIZE_MAXIMIZED;