]> git.saurik.com Git - wxWidgets.git/commitdiff
fixed RR's change of wxSizer::Fit to set client size (r50717) to not be completely...
authorVáclav Slavík <vslavik@fastmail.fm>
Fri, 1 Feb 2008 22:28:10 +0000 (22:28 +0000)
committerVáclav Slavík <vslavik@fastmail.fm>
Fri, 1 Feb 2008 22:28:10 +0000 (22:28 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51497 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/common/sizer.cpp

index 9a0cb0fcf750c943cfedc97c8c92d428914633d2..eb5eb59bbe954651f3b9bdcedef4d05b23978e5c 100644 (file)
@@ -837,7 +837,7 @@ void wxSizer::DeleteWindows()
 wxSize wxSizer::Fit( wxWindow *window )
 {
     // take the min size by default and limit it by max size
-    wxSize size = GetMinWindowSize(window);
+    wxSize size = GetMinClientSize(window);
 
     wxTopLevelWindow *tlw = wxDynamicCast(window, wxTopLevelWindow);
     if ( tlw )
@@ -878,7 +878,7 @@ wxSize wxSizer::Fit( wxWindow *window )
     }
     else
     {
-        wxSize sizeMax = GetMaxWindowSize(window);
+        wxSize sizeMax = GetMaxClientSize(window);
         
         if ( sizeMax.x != wxDefaultCoord && size.x > sizeMax.x )
                 size.x = sizeMax.x;