Removed GetAdjustedBestSize().
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42742 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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
|
||||
|
@@ -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
|
||||
//
|
||||
|
Reference in New Issue
Block a user