From a06fb27f211db6e9ec2f7602a3301550e454ae92 Mon Sep 17 00:00:00 2001 From: wangqr Date: Tue, 19 May 2020 00:22:01 -0400 Subject: [PATCH] Implement wxSpinCtrl::GetSizeFromTextSize for wxOSX/Cocoa The value is calculated based on size of wxTextCtrl --- src/generic/spinctlg.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/generic/spinctlg.cpp b/src/generic/spinctlg.cpp index 29443b6f3d..3b3ccf64d2 100644 --- a/src/generic/spinctlg.cpp +++ b/src/generic/spinctlg.cpp @@ -278,6 +278,10 @@ wxSize wxSpinCtrlGenericBase::DoGetBestSize() const wxSize wxSpinCtrlGenericBase::DoGetSizeFromTextSize(int xlen, int ylen) const { +#ifdef __WXOSX__ + wxSize sizeBtn = m_spinButton->GetBestSize(), sizeText = m_textCtrl->GetSizeFromTextSize(xlen, ylen); + return wxSize(sizeBtn.GetWidth() + sizeText.GetWidth() + MARGIN, wxMax(sizeBtn.GetHeight(), sizeText.GetHeight())); +#else wxSize sizeBtn = m_spinButton->GetBestSize(); wxSize totalS( m_textCtrl->GetBestSize() ); @@ -293,6 +297,7 @@ wxSize wxSpinCtrlGenericBase::DoGetSizeFromTextSize(int xlen, int ylen) const tsize.IncBy(0, ylen - GetCharHeight()); return tsize; +#endif } void wxSpinCtrlGenericBase::DoMoveWindow(int x, int y, int width, int height)