GetBestFittingSize --> GetEffectiveMinSize

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

View File

@@ -235,7 +235,7 @@ bool wxCalendarCtrl::Create(wxWindow *parent,
// we need to set the position as well because the main control position
// is not the same as the one specified in pos if we have the controls
// above it
SetBestSize(size);
SetInitialSize(size);
SetPosition(pos);
// Since we don't paint the whole background make sure that the platform
@@ -790,7 +790,7 @@ void wxCalendarCtrl::DoMoveWindow(int x, int y, int width, int height)
if ( !HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) && m_staticMonth )
{
wxSize sizeCombo = m_comboMonth->GetBestFittingSize();
wxSize sizeCombo = m_comboMonth->GetEffectiveMinSize();
wxSize sizeStatic = m_staticMonth->GetSize();
wxSize sizeSpin = m_spinYear->GetSize();