X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad81651f00edc6f489d9b6a0839d316a964fd521..2cc78389312dce6285d0d6b6e891d24372252ada:/src/mac/spinbutt.cpp

diff --git a/src/mac/spinbutt.cpp b/src/mac/spinbutt.cpp
index 5ec5e1b8a2..fc4e5e5888 100644
--- 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)
@@ -41,7 +49,7 @@ bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, c
 	
 	MacPreControlCreate( parent , id ,  "" , pos , size ,style,*( (wxValidator*) NULL ) , name , &bounds , title ) ;
 
-	m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , 0 , 0 , 100, 
+	m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , 0 , 100, 
 		kControlLittleArrowsProc , (long) this ) ;
 	
 	wxASSERT_MSG( m_macControl != NULL , "No valid mac control" ) ;
@@ -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;
@@ -66,17 +84,14 @@ int wxSpinButton::GetValue() const
 void wxSpinButton::SetValue(int val)
 {
 	m_value = val ;
-  wxScrollEvent event(wxEVT_SCROLL_THUMBTRACK, m_windowId);
-
-  event.SetPosition(m_value);
-  event.SetEventObject( this );
-  GetEventHandler()->ProcessEvent(event);
 }
 
 void wxSpinButton::SetRange(int minVal, int maxVal)
 {
 	m_min = minVal;
 	m_max = maxVal;
+    SetControlMaximum( m_macControl , maxVal ) ;
+    SetControlMinimum(  m_macControl , minVal ) ;
 }
 
 void wxSpinButton::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) 
@@ -84,8 +99,9 @@ void wxSpinButton::MacHandleControlClick( ControlHandle control , SInt16 control
 	if ( m_macControl == NULL )
 		return ;
 	
+	int oldValue = m_value ;
   wxEventType scrollEvent = wxEVT_NULL;
-  int nScrollInc;
+  int nScrollInc = 0;
 
 	switch( controlpart )
 	{
@@ -117,18 +133,33 @@ void wxSpinButton::MacHandleControlClick( ControlHandle control , SInt16 control
       m_value = m_max;
   }
   	
-  wxScrollEvent event(scrollEvent, m_windowId);
+  wxSpinEvent event(scrollEvent, m_windowId);
 
   event.SetPosition(m_value);
   event.SetEventObject( this );
-  GetEventHandler()->ProcessEvent(event);
+  if ((GetEventHandler()->ProcessEvent( event )) &&
+        !event.IsAllowed() )
+  {
+  	m_value = oldValue ;
+  }
+  SetControlValue(  m_macControl , m_value ) ;
+
+    /* always send a thumbtrack event */
+    if (scrollEvent != wxEVT_SCROLL_THUMBTRACK)
+    {
+        scrollEvent = wxEVT_SCROLL_THUMBTRACK;
+        wxSpinEvent event2( scrollEvent, GetId());
+        event2.SetPosition( m_value );
+        event2.SetEventObject( this );
+        GetEventHandler()->ProcessEvent( event2 );
+    }
 }
 
 // ----------------------------------------------------------------------------
 // size calculation
 // ----------------------------------------------------------------------------
 
-wxSize wxSpinButton::DoGetBestSize()
+wxSize wxSpinButton::DoGetBestSize() const
 {
     if ( (GetWindowStyle() & wxSP_VERTICAL) != 0 )
     {