X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/519cb848a8f4c91c73421bb75314754284e593a4..79f585d90388128f9d245f7c92d3013b98b9ed14:/src/mac/spinbutt.cpp

diff --git a/src/mac/spinbutt.cpp b/src/mac/spinbutt.cpp
index 8f3e1533b8..944f72dc10 100644
--- a/src/mac/spinbutt.cpp
+++ b/src/mac/spinbutt.cpp
@@ -16,15 +16,16 @@
 #include "wx/spinbutt.h"
 #include "wx/mac/uma.h"
 
-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)
-#endif
+// ============================================================================
+// implementation
+// ============================================================================
 
-wxSpinButton::wxSpinButton()
-{
-	m_min = 0;
-	m_max = 100;
-}
+// ----------------------------------------------------------------------------
+// wxWin macros
+// ----------------------------------------------------------------------------
+
+    IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)
+    IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent);
 
 bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
             long style, const wxString& name)
@@ -78,14 +79,6 @@ void wxSpinButton::SetRange(int minVal, int maxVal)
 	m_max = maxVal;
 }
 
-// Spin event
-IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent)
-
-wxSpinEvent::wxSpinEvent(wxEventType commandType, int id):
-  wxScrollEvent(commandType, id)
-{
-}
-
 void wxSpinButton::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) 
 {
 	if ( m_macControl == NULL )
@@ -131,4 +124,23 @@ void wxSpinButton::MacHandleControlClick( ControlHandle control , SInt16 control
   GetEventHandler()->ProcessEvent(event);
 }
 
+// ----------------------------------------------------------------------------
+// size calculation
+// ----------------------------------------------------------------------------
+
+wxSize wxSpinButton::DoGetBestSize() const
+{
+    if ( (GetWindowStyle() & wxSP_VERTICAL) != 0 )
+    {
+        // vertical control
+        return wxSize(16,
+                      2*16);
+    }
+    else
+    {
+        // horizontal control
+        return wxSize(2*16,
+                      16);
+    }
+}