X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/51abe921b849be69f02c174365c9a7bc8b46bd08..7dc3cc31af71522b8fc55b7f97bcba7f5ef9eac5:/src/mac/carbon/button.cpp?ds=sidebyside diff --git a/src/mac/carbon/button.cpp b/src/mac/carbon/button.cpp index 826a7756d8..4635492a17 100644 --- a/src/mac/carbon/button.cpp +++ b/src/mac/carbon/button.cpp @@ -15,9 +15,7 @@ #include "wx/button.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl) -#endif #include // Button @@ -66,7 +64,7 @@ void wxButton::SetDefault() } } -wxSize wxButton::DoGetBestSize() +wxSize wxButton::DoGetBestSize() const { int wBtn = m_label.Length() * 8 + 12 + 2 * m_macHorizontalBorder; int hBtn = 13 + 2 * m_macVerticalBorder; @@ -74,6 +72,14 @@ wxSize wxButton::DoGetBestSize() return wxSize(wBtn, hBtn); } +wxSize wxButton::GetDefaultSize() +{ + int wBtn = 15 * 8 + 12 + 2 * 2; + int hBtn = 13 + 2 * 2; + + return wxSize(wBtn, hBtn); +} + void wxButton::Command (wxCommandEvent & event) { ProcessCommand (event);