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

diff --git a/src/mac/spinbutt.cpp b/src/mac/spinbutt.cpp
index 8f3e1533b8..fd9d5d4e47 100644
--- a/src/mac/spinbutt.cpp
+++ b/src/mac/spinbutt.cpp
@@ -11,19 +11,28 @@
 
 #ifdef __GNUG__
 #pragma implementation "spinbutt.h"
+#pragma implementation "spinbuttbase.h"
 #endif
 
 #include "wx/spinbutt.h"
 #include "wx/mac/uma.h"
 
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxWin macros
+// ----------------------------------------------------------------------------
+
 #if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)
+    IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)
+    IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent)
 #endif
 
 wxSpinButton::wxSpinButton()
+   : wxSpinButtonBase()
 {
-	m_min = 0;
-	m_max = 100;
 }
 
 bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
@@ -40,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() ;
 
@@ -57,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;
@@ -65,70 +84,95 @@ 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 ) ;
 }
 
-// Spin event
-IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent)
-
-wxSpinEvent::wxSpinEvent(wxEventType commandType, int id):
-  wxScrollEvent(commandType, id)
+void wxSpinButton::MacHandleValueChanged( int inc )
 {
+     
+    wxEventType scrollEvent = wxEVT_NULL;
+	int oldValue = m_value ;
+
+    m_value = oldValue + inc;
+
+    if (m_value < m_min)
+    {
+    if ( m_windowStyle & wxSP_WRAP )
+      m_value = m_max;
+    else
+      m_value = m_min;
+    }
+
+    if (m_value > m_max)
+    {
+    if ( m_windowStyle & wxSP_WRAP )
+      m_value = m_min;
+    else
+      m_value = m_max;
+    }
+
+    if ( m_value - oldValue == -1 )
+        scrollEvent = wxEVT_SCROLL_LINEDOWN ;
+    else if ( m_value - oldValue == 1 )
+        scrollEvent = wxEVT_SCROLL_LINEUP ;
+    else
+        scrollEvent = wxEVT_SCROLL_THUMBTRACK ;
+        
+    wxSpinEvent event(scrollEvent, m_windowId);
+
+    event.SetPosition(m_value);
+    event.SetEventObject( this );
+    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 );
+    }
 }
 
-void wxSpinButton::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) 
+void wxSpinButton::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) 
 {
-	if ( m_macControl == NULL )
+	if ( (ControlHandle) m_macControl == NULL )
 		return ;
 	
-  wxEventType scrollEvent = wxEVT_NULL;
-  int nScrollInc;
+  int nScrollInc = 0;
 
 	switch( controlpart )
 	{
 		case kControlUpButtonPart :
-        nScrollInc = 1;
-        scrollEvent = wxEVT_SCROLL_LINEUP;
+            nScrollInc = 1;
 			break ;
 		case kControlDownButtonPart :
-        nScrollInc = -1;
-        scrollEvent = wxEVT_SCROLL_LINEDOWN;
+            nScrollInc = -1;
 			break ;
 	}
+	MacHandleValueChanged( nScrollInc ) ;
 
-  m_value = m_value + nScrollInc;
+}
 
-  if (m_value < m_min)
-  {
-  	if ( m_windowStyle & wxSP_WRAP )
-      m_value = m_max;
-  	else
-      m_value = m_min;
-  }
-  
-  if (m_value > m_max)
-  {
-  	if ( m_windowStyle & wxSP_WRAP )
-      m_value = m_min;
-    else
-      m_value = m_max;
-  }
-  	
-  wxScrollEvent event(scrollEvent, m_windowId);
+// ----------------------------------------------------------------------------
+// size calculation
+// ----------------------------------------------------------------------------
 
-  event.SetPosition(m_value);
-  event.SetEventObject( this );
-  GetEventHandler()->ProcessEvent(event);
+wxSize wxSpinButton::DoGetBestSize() const
+{
+  return wxSize(16,24);
 }
 
-