AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Correctly handle default position values of -1 in wxQT, thanks @seandepagnier

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77916 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mariano Reingart 2014-09-29 03:06:27 +00:00
parent 2d83f86841
commit b922ee8ac9
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/qt/window.cpp
View File

@ -227,7 +227,11 @@ bool wxWindowQt::Create( wxWindowQt * parent, wxWindowID id, const wxPoint & pos
parent->AddChild( this ); parent->AddChild( this );
DoMoveWindow( pos.x, pos.y, size.GetWidth(), size.GetHeight() ); wxPoint p;
if(pos != wxDefaultPosition)
p = pos;
DoMoveWindow( p.x, p.y, size.GetWidth(), size.GetHeight() );
PostCreation(); PostCreation();
@ -808,6 +812,14 @@ void wxWindowQt::DoSetSize(int x, int y, int width, int height, int sizeFlags )
if ( height == wxDefaultCoord && ( sizeFlags & wxSIZE_AUTO_HEIGHT )) if ( height == wxDefaultCoord && ( sizeFlags & wxSIZE_AUTO_HEIGHT ))
height = BEST_SIZE.y; height = BEST_SIZE.y;
} }
int w, h;
GetSize(&w, &h);
if (width == -1)
width = w;
if (height == -1)
height = h;
DoMoveWindow( x, y, width, height ); DoMoveWindow( x, y, width, height );
} }