From 39d586421ba3fdfa095e4392a857c3be602b9fe7 Mon Sep 17 00:00:00 2001 From: Artur Wieczorek Date: Thu, 21 May 2020 22:49:03 +0200 Subject: [PATCH] Don't call GetSizeFromText() under wxOSX We cannot use GetSizeFromText() to calculate numeric box size under wxOSX because this function calls GetSizeFromTextSize() which is implemented only in wxMSW and wxGTK. --- src/generic/spinctlg.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/generic/spinctlg.cpp b/src/generic/spinctlg.cpp index 1d3b967903..5d0bcf5972 100644 --- a/src/generic/spinctlg.cpp +++ b/src/generic/spinctlg.cpp @@ -112,6 +112,9 @@ public: event.Skip(); } +#if defined(__WXMSW__) || defined(__WXGTK__) + // GetSizeFromTextSize() is not implemented in wxOSX + // so GetSizeFromText() cannot be used for size calculations. virtual wxSize DoGetBestSize() const wxOVERRIDE { wxString minVal = m_spin->DoValueToText(m_spin->m_min); @@ -121,6 +124,7 @@ public: return wxSize(wxMax(minValSize.x, maxValSize.x), wxMax(minValSize.y, maxValSize.y)); } +#endif // __WXMSW || __WXGTK__ wxSpinCtrlGenericBase *m_spin;