From 20aeaa203c953fd988c4d266f1c955b5dd716810 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 29 Oct 2006 21:10:12 +0000 Subject: [PATCH] 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 --- src/common/toplvcmn.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/common/toplvcmn.cpp b/src/common/toplvcmn.cpp index 88350bebcf..9e0d6357e5 100644 --- a/src/common/toplvcmn.cpp +++ b/src/common/toplvcmn.cpp @@ -165,16 +165,16 @@ void wxTopLevelWindowBase::GetRectForTopLevelChildren(int *x, int *y, int *w, in wxSize wxTopLevelWindowBase::GetMaxSize() const { - wxSize size( GetMaxWidth(), GetMaxHeight() ); - int w, h; + wxSize size = wxWindow::GetMaxSize(); - wxClientDisplayRect( 0, 0, &w, &h ); + int w, h; + wxClientDisplayRect(NULL, NULL, &w, &h ); - if( size.GetWidth() == wxDefaultCoord ) - size.SetWidth( w ); + if ( size.GetWidth() == wxDefaultCoord ) + size.SetWidth(w); - if( size.GetHeight() == wxDefaultCoord ) - size.SetHeight( h ); + if ( size.GetHeight() == wxDefaultCoord ) + size.SetHeight(h); return size; } -- 2.47.2