avoid infinite recursion by not using GetMaxWidth/Height() from GetMaxSize() implementation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42671 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -165,16 +165,16 @@ void wxTopLevelWindowBase::GetRectForTopLevelChildren(int *x, int *y, int *w, in
|
|||||||
|
|
||||||
wxSize wxTopLevelWindowBase::GetMaxSize() const
|
wxSize wxTopLevelWindowBase::GetMaxSize() const
|
||||||
{
|
{
|
||||||
wxSize size( GetMaxWidth(), GetMaxHeight() );
|
wxSize size = wxWindow::GetMaxSize();
|
||||||
int w, h;
|
|
||||||
|
|
||||||
wxClientDisplayRect( 0, 0, &w, &h );
|
int w, h;
|
||||||
|
wxClientDisplayRect(NULL, NULL, &w, &h );
|
||||||
|
|
||||||
if( size.GetWidth() == wxDefaultCoord )
|
if ( size.GetWidth() == wxDefaultCoord )
|
||||||
size.SetWidth( w );
|
size.SetWidth(w);
|
||||||
|
|
||||||
if( size.GetHeight() == wxDefaultCoord )
|
if ( size.GetHeight() == wxDefaultCoord )
|
||||||
size.SetHeight( h );
|
size.SetHeight(h);
|
||||||
|
|
||||||
return size;
|
return size;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user