X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/566d84a7c3c06956562b9f8ac364aa3bad760c10..06aa2a5508ab2bcdd69e6c5f6660c96e79b35f3d:/src/common/sizer.cpp

diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index 3233856426..125f342b32 100644
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -400,7 +400,7 @@ void wxSizer::DeleteWindows()
     }
 }
 
-void wxSizer::Fit( wxWindow *window )
+wxSize wxSizer::Fit( wxWindow *window )
 {
     wxSize size;
     if (window->IsTopLevel())
@@ -408,8 +408,9 @@ void wxSizer::Fit( wxWindow *window )
     else
         size = GetMinWindowSize( window );
 
-    //window->SetClientSize( size );
     window->SetSize( size );
+
+    return size;
 }
 
 void wxSizer::FitInside( wxWindow *window )
@@ -434,8 +435,8 @@ void wxSizer::SetSizeHints( wxWindow *window )
     // Preserve the window's max size hints, but set the
     // lower bound according to the sizer calculations.
 
-    Fit( window );
-    wxSize  size( window->GetSize() );
+    wxSize size = Fit( window );
+
     window->SetSizeHints( size.x,
                           size.y,
                           window->GetMaxWidth(),
@@ -501,7 +502,7 @@ wxSize wxSizer::GetMaxClientSize( wxWindow *window )
         return wxDefaultSize;
 }
 
-wxSize wxSizer::GetMinClientSize( wxWindow *window )
+wxSize wxSizer::GetMinClientSize( wxWindow *WXUNUSED(window) )
 {
     return GetMinSize();  // Already returns client size.
 }