wxSIZE_ALLOW_MINUS_ONE handling corrected

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5232 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2000-01-04 14:53:13 +00:00
parent c79853685d
commit f8c0354763

View File

@ -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);