Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

in DoSetSize, only call GetPosition if necessary

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69605 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2011-10-31 05:22:59 +00:00
parent cb0c51acf8
commit 6d50fadaea
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/gtk/window.cpp
View File

@@ -2523,12 +2523,15 @@ void wxWindowGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags
wxASSERT_MSG( (m_widget != NULL), wxT("invalid window") ); wxASSERT_MSG( (m_widget != NULL), wxT("invalid window") );
wxASSERT_MSG( (m_parent != NULL), wxT("wxWindowGTK::SetSize requires parent.\n") ); wxASSERT_MSG( (m_parent != NULL), wxT("wxWindowGTK::SetSize requires parent.\n") );
int currentX, currentY; if ((sizeFlags & wxSIZE_ALLOW_MINUS_ONE) == 0 && (x == -1 || y == -1))
GetPosition(&currentX, &currentY); {
if (x == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) int currentX, currentY;
x = currentX; GetPosition(&currentX, &currentY);
if (y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) if (x == -1)
y = currentY; x = currentX;
if (y == -1)
y = currentY;
}
AdjustForParentClientOrigin(x, y, sizeFlags); AdjustForParentClientOrigin(x, y, sizeFlags);
// calculate the best size if we should auto size the window // calculate the best size if we should auto size the window