Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GetBestFittingSize --> GetEffectiveMinSize

Browse Source 
SetBestFittingSize --> SetInitialSize
SetBestSize  --> SetInitialSize
SetInitialBestSize --> SetInitialSize


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42816 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2006-10-31 08:50:17 +00:00
parent 1e0e7f7d0e
commit 170acdc90e
103 changed files with 173 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/wincmn.cpp
View File

@@ -580,7 +580,7 @@ wxSize wxWindowBase::DoGetBestSize() const
}
wxSize wxWindowBase::GetBestFittingSize() const
wxSize wxWindowBase::GetEffectiveMinSize() const
{
// merge the best size with the min size, giving priority to the min size
wxSize min = GetMinSize();
@@ -594,14 +594,14 @@ wxSize wxWindowBase::GetBestFittingSize() const
}
void wxWindowBase::SetBestFittingSize(const wxSize& size)
void wxWindowBase::SetInitialSize(const wxSize& size)
{
// Set the min size to the size passed in. This will usually either be
// wxDefaultSize or the size passed to this window's ctor/Create function.
SetMinSize(size);
// Merge the size with the best size if needed
wxSize best = GetBestFittingSize();
wxSize best = GetEffectiveMinSize();
// If the current size doesn't match then change it
if (GetSize() != best)