Removed GetAdjustedBestSize().

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42742 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/window.h b/include/wx/window.h
index a9179c5d270f849b082a6c36f064e2d1cf50b455..e15b3291d4e33a891cf3a4c4b1f44907e86f7a7a 100644 (file)
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -353,16 +353,6 @@ public:
     void CacheBestSize(const wxSize& size) const
         { wxConstCast(this, wxWindowBase)->m_bestSizeCache = size; }
 
-        // There are times (and windows) where 'Best' size and 'Min' size
-        // are vastly out of sync.  This should be remedied somehow, but in
-        // the meantime, this method will return the larger of BestSize
-        // (the window's smallest legible size), and any user specified
-        // MinSize hint.
-    wxSize GetAdjustedBestSize() const
-    {
-        wxSize  s( GetBestSize() );
-        return wxSize( wxMax( s.x, GetMinWidth() ), wxMax( s.y, GetMinHeight() ) );
-    }
 
         // This function will merge the window's best size into the window's
         // minimum size, giving priority to the min size components, and

diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp
index 6e084f1696e5cd895820a1d8b2a3b7b9317921b3..a869918ae00b45db97a77e24bc506b54458de9ad 100644 (file)
--- a/src/generic/splitter.cpp
+++ b/src/generic/splitter.cpp
@@ -884,9 +884,9 @@ wxSize wxSplitterWindow::DoGetBestSize() const
     // get best sizes of subwindows
     wxSize size1, size2;
     if ( m_windowOne )
-        size1 = m_windowOne->GetAdjustedBestSize();
+        size1 = m_windowOne->GetBestFittingSize();
     if ( m_windowTwo )
-        size2 = m_windowTwo->GetAdjustedBestSize();
+        size2 = m_windowTwo->GetBestFittingSize();
 
     // sum them
     //