call SetInitialBestSize(), not SetBestSize(), when setting the best size initially

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27073 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2004-05-03 12:38:20 +00:00
parent 400a9e419b
commit 085dd1e96f
2 changed files with 12 additions and 4 deletions

View File

@ -77,6 +77,17 @@ protected:
// initialize the common fields of wxCommandEvent
void InitCommandEvent(wxCommandEvent& event) const;
// set the initial window size if none is given (i.e. at least one of the
// components of the size passed to ctor/Create() is -1)
//
// normally just calls SetBestSize() but can be overridden not to do it for
// the controls which have to do some additional initialization (e.g. add
// strings to list box) before their best size can be accurately calculated
virtual void SetInitialBestSize(const wxSize& size)
{
SetBestSize(size);
}
DECLARE_NO_COPY_CLASS(wxControlBase)
};

View File

@ -171,10 +171,7 @@ bool wxControl::MSWCreateControl(const wxChar *classname,
SetFont(GetDefaultAttributes().font);
// set the size now if no initial size specified
if ( w <= 0 || h <= 0 )
{
SetBestSize(size);
}
SetInitialBestSize(size);
return TRUE;
}