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:
@@ -128,9 +128,9 @@ bool wxButton::Create(wxWindow *parent,
|
||||
SetLabel(label);
|
||||
|
||||
if (bitmap.Ok())
|
||||
SetImageLabel(bitmap); // SetBestSize called by SetImageLabel()
|
||||
SetImageLabel(bitmap); // SetInitialSize called by SetImageLabel()
|
||||
else
|
||||
SetBestSize(size);
|
||||
SetInitialSize(size);
|
||||
|
||||
CreateInputHandler(wxINP_HANDLER_BUTTON);
|
||||
|
||||
@@ -327,7 +327,7 @@ void wxButton::SetImageMargins(wxCoord x, wxCoord y)
|
||||
m_marginBmpX = x + 2;
|
||||
m_marginBmpY = y + 2;
|
||||
|
||||
SetBestSize(wxDefaultSize);
|
||||
SetInitialSize(wxDefaultSize);
|
||||
}
|
||||
|
||||
void wxButton::SetDefault()
|
||||
|
Reference in New Issue
Block a user