cosmetic fixes to font encoding names

[wxWidgets.git] / src / mac / carbon / spinbutt.cpp

diff --git a/src/mac/carbon/spinbutt.cpp b/src/mac/carbon/spinbutt.cpp
index 8f3e1533b86bad4403aad5c260b58ccd170d233c..f5ac7bc9bb64660f145224c52fd2c841ed8e6bc5 100644 (file)
--- a/src/mac/carbon/spinbutt.cpp
+++ b/src/mac/carbon/spinbutt.cpp
@@ -16,16 +16,19 @@
 #include "wx/spinbutt.h"
 #include "wx/mac/uma.h"
 
 #include "wx/spinbutt.h"
 #include "wx/mac/uma.h"
 

+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxWin macros
+// ----------------------------------------------------------------------------
+

 #if !USE_SHARED_LIBRARY
 #if !USE_SHARED_LIBRARY

-IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)
+    IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)
+    IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent);

 #endif
 
 #endif
 

-wxSpinButton::wxSpinButton()
-{
-       m_min = 0;
-       m_max = 100;
-}
-

 bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
             long style, const wxString& name)
 {
 bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
             long style, const wxString& name)
 {


@@ -78,14 +81,6 @@ void wxSpinButton::SetRange(int minVal, int maxVal)
        m_max = 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 )
 void wxSpinButton::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) 
 {
        if ( m_macControl == NULL )


@@ -131,4 +126,23 @@ void wxSpinButton::MacHandleControlClick( ControlHandle control , SInt16 control
   GetEventHandler()->ProcessEvent(event);
 }
 
   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);
+    }
+}