prevent explicitly set client size from being changed when frame extents become known
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51190 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
30de1d4d09
commit
428f841bd0
@ -131,7 +131,7 @@ protected:
|
||||
int width, int height,
|
||||
int sizeFlags = wxSIZE_AUTO);
|
||||
|
||||
// override these methods to take into account tool/menu/statusbars
|
||||
virtual void DoSetClientSize(int width, int height);
|
||||
virtual void DoGetClientSize(int *width, int *height) const;
|
||||
|
||||
// string shown in the title bar
|
||||
|
@ -955,6 +955,14 @@ void wxTopLevelWindowGTK::DoSetSize( int x, int y, int width, int height, int si
|
||||
}
|
||||
}
|
||||
|
||||
void wxTopLevelWindowGTK::DoSetClientSize(int width, int height)
|
||||
{
|
||||
if (m_deferShow && !m_isShown)
|
||||
// Since client size is being explicitly set, don't change it later
|
||||
m_deferShow = false;
|
||||
wxTopLevelWindowBase::DoSetClientSize(width, height);
|
||||
}
|
||||
|
||||
void wxTopLevelWindowGTK::DoGetClientSize( int *width, int *height ) const
|
||||
{
|
||||
wxASSERT_MSG(m_widget, wxT("invalid frame"));
|
||||
|
Loading…
Reference in New Issue
Block a user