wxSIZE_ALLOW_MINUS_ONE handling corrected

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5232 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index b3c922955f735940bf50b93f73c9ef3bd9c17f5c..5592a346bc89a8b25d0ae9e20638d2dad070d361 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -1209,9 +1209,9 @@ void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags)
         return;
     }
 
-    if ( x == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
+    if ( x == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
         x = currentX;
-    if ( y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
+    if ( y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
         y = currentY;
 
     AdjustForParentClientOrigin(x, y, sizeFlags);