mac changes : wxDC - removed doubly defined vars (inherited from base) and fixed...

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

diff --git a/src/mac/spinbutt.cpp b/src/mac/spinbutt.cpp
index 5ec5e1b8a2ac19cce1e5f426c08a8259bf042395..fc9954f9e5eb71304132012057d9321150ebddbb 100644 (file)
--- a/src/mac/spinbutt.cpp
+++ b/src/mac/spinbutt.cpp
@@ -11,6 +11,7 @@
 
 #ifdef __GNUG__
 #pragma implementation "spinbutt.h"
+#pragma implementation "spinbuttbase.h"
 #endif
 
 #include "wx/spinbutt.h"
@@ -24,8 +25,15 @@
 // wxWin macros
 // ----------------------------------------------------------------------------
 
+#if !USE_SHARED_LIBRARY
     IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)
     IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent);
+#endif
+
+wxSpinButton::wxSpinButton()
+   : wxSpinButtonBase()
+{
+}
 
 bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
             long style, const wxString& name)
@@ -58,6 +66,16 @@ wxSpinButton::~wxSpinButton()
 // Attributes
 ////////////////////////////////////////////////////////////////////////////
 
+int wxSpinButton::GetMin() const
+{
+   return m_min;
+}
+
+int wxSpinButton::GetMax() const
+{
+   return m_max;
+}
+
 int wxSpinButton::GetValue() const
 {
     return m_value;
@@ -85,7 +103,7 @@ void wxSpinButton::MacHandleControlClick( ControlHandle control , SInt16 control
                return ;
        
   wxEventType scrollEvent = wxEVT_NULL;
-  int nScrollInc;
+  int nScrollInc = 0;
 
        switch( controlpart )
        {
@@ -128,7 +146,7 @@ void wxSpinButton::MacHandleControlClick( ControlHandle control , SInt16 control
 // size calculation
 // ----------------------------------------------------------------------------
 
-wxSize wxSpinButton::DoGetBestSize()
+wxSize wxSpinButton::DoGetBestSize() const
 {
     if ( (GetWindowStyle() & wxSP_VERTICAL) != 0 )
     {