X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/03e11df5470fd64d9d9a669d0b50b84c2d714736..cd5e9298159e58f57e05f3b76c9d4a45e1eefe12:/src/mac/spinbutt.cpp

diff --git a/src/mac/spinbutt.cpp b/src/mac/spinbutt.cpp
index fc9954f9e5..e3beab7322 100644
--- a/src/mac/spinbutt.cpp
+++ b/src/mac/spinbutt.cpp
@@ -49,10 +49,10 @@ 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 = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 100, 
 		kControlLittleArrowsProc , (long) this ) ;
 	
-	wxASSERT_MSG( m_macControl != NULL , "No valid mac control" ) ;
+	wxASSERT_MSG( (ControlHandle) m_macControl != NULL , "No valid mac control" ) ;
 
 	MacPostControlCreate() ;
 
@@ -84,24 +84,22 @@ 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( (ControlHandle) m_macControl , maxVal ) ;
+    SetControlMinimum((ControlHandle) m_macControl , minVal ) ;
 }
 
-void wxSpinButton::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) 
+void wxSpinButton::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) 
 {
-	if ( m_macControl == NULL )
+	if ( (ControlHandle) m_macControl == NULL )
 		return ;
 	
+	int oldValue = m_value ;
   wxEventType scrollEvent = wxEVT_NULL;
   int nScrollInc = 0;
 
@@ -135,11 +133,26 @@ 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( (ControlHandle) 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 );
+    }
 }
 
 // ----------------------------------------------------------------------------
@@ -148,17 +161,6 @@ void wxSpinButton::MacHandleControlClick( ControlHandle control , SInt16 control
 
 wxSize wxSpinButton::DoGetBestSize() const
 {
-    if ( (GetWindowStyle() & wxSP_VERTICAL) != 0 )
-    {
-        // vertical control
-        return wxSize(16,
-                      2*16);
-    }
-    else
-    {
-        // horizontal control
-        return wxSize(2*16,
-                      16);
-    }
+  return wxSize(16,24);
 }