textctrl.cpp: Removed assert from CanRedo/CanUndo since the best behaviour is

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

diff --git a/src/mac/spinbutt.cpp b/src/mac/spinbutt.cpp
index e3beab732260c050d4c289571239892518cf6319..f744cb2b0a2e6f4b70bb2a5b66fd637a3059d061 100644 (file)
--- a/src/mac/spinbutt.cpp
+++ b/src/mac/spinbutt.cpp
@@ -27,7 +27,7 @@
 
 #if !USE_SHARED_LIBRARY
     IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)
 
 #if !USE_SHARED_LIBRARY
     IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)

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

 #endif
 
 wxSpinButton::wxSpinButton()
 #endif
 
 wxSpinButton::wxSpinButton()


@@ -83,7 +83,7 @@ int wxSpinButton::GetValue() const
 
 void wxSpinButton::SetValue(int val)
 {
 
 void wxSpinButton::SetValue(int val)
 {

-       m_value = val ;
+       MacHandleValueChanged( val - m_value ) ;

 }
 
 void wxSpinButton::SetRange(int minVal, int maxVal)
 }
 
 void wxSpinButton::SetRange(int minVal, int maxVal)


@@ -94,55 +94,47 @@ void wxSpinButton::SetRange(int minVal, int maxVal)
     SetControlMinimum((ControlHandle) m_macControl , minVal ) ;
 }
 
     SetControlMinimum((ControlHandle) m_macControl , minVal ) ;
 }
 

-void wxSpinButton::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) 
+void wxSpinButton::MacHandleValueChanged( int inc )

 {
 {

-       if ( (ControlHandle) m_macControl == NULL )
-               return ;
-       
+     
+    wxEventType scrollEvent = wxEVT_NULL;

        int oldValue = m_value ;
        int oldValue = m_value ;

-  wxEventType scrollEvent = wxEVT_NULL;
-  int nScrollInc = 0;
-
-       switch( controlpart )
-       {
-               case kControlUpButtonPart :
-        nScrollInc = 1;
-        scrollEvent = wxEVT_SCROLL_LINEUP;
-                       break ;
-               case kControlDownButtonPart :
-        nScrollInc = -1;
-        scrollEvent = wxEVT_SCROLL_LINEDOWN;
-                       break ;
-       }

 
 

-  m_value = m_value + nScrollInc;
+    m_value = oldValue + inc;

 
 

-  if (m_value < m_min)
-  {
-       if ( m_windowStyle & wxSP_WRAP )
+    if (m_value < m_min)
+    {
+    if ( m_windowStyle & wxSP_WRAP )

       m_value = m_max;
       m_value = m_max;

-       else
+    else

       m_value = m_min;
       m_value = m_min;

-  }
-  
-  if (m_value > m_max)
-  {
-       if ( m_windowStyle & wxSP_WRAP )
+    }
+
+    if (m_value > m_max)
+    {
+    if ( m_windowStyle & wxSP_WRAP )

       m_value = m_min;
     else
       m_value = m_max;
       m_value = m_min;
     else
       m_value = m_max;

-  }
-       
-  wxSpinEvent event(scrollEvent, m_windowId);
+    }
+
+    if ( oldValue - m_value == -1 )
+        scrollEvent = wxEVT_SCROLL_LINEDOWN ;
+    else if ( oldValue - m_value == 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.SetPosition(m_value);
+    event.SetEventObject( this );
+    if ((GetEventHandler()->ProcessEvent( event )) &&

         !event.IsAllowed() )
         !event.IsAllowed() )

-  {
-       m_value = oldValue ;
-  }
-  SetControlValue( (ControlHandle) m_macControl , m_value ) ;
+    {
+        m_value = oldValue ;
+    }
+    SetControlValue( (ControlHandle) m_macControl , m_value ) ;

 
     /* always send a thumbtrack event */
     if (scrollEvent != wxEVT_SCROLL_THUMBTRACK)
 
     /* always send a thumbtrack event */
     if (scrollEvent != wxEVT_SCROLL_THUMBTRACK)


@@ -155,6 +147,26 @@ void wxSpinButton::MacHandleControlClick( WXWidget control , wxInt16 controlpart
     }
 }
 
     }
 }
 

+void wxSpinButton::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) 
+{
+       if ( (ControlHandle) m_macControl == NULL )
+               return ;
+       
+  int nScrollInc = 0;
+
+       switch( controlpart )
+       {
+               case kControlUpButtonPart :
+            nScrollInc = 1;
+                       break ;
+               case kControlDownButtonPart :
+            nScrollInc = -1;
+                       break ;
+       }
+       MacHandleValueChanged( nScrollInc ) ;
+
+}
+

 // ----------------------------------------------------------------------------
 // size calculation
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // size calculation
 // ----------------------------------------------------------------------------