fix for getting CW Carbon Target

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

diff --git a/src/mac/spinbutt.cpp b/src/mac/spinbutt.cpp
index f744cb2b0a2e6f4b70bb2a5b66fd637a3059d061..08151678acd3e7fd2a8f7e2248a6d581e871ef43 100644 (file)
--- a/src/mac/spinbutt.cpp
+++ b/src/mac/spinbutt.cpp
@@ -83,15 +83,15 @@ int wxSpinButton::GetValue() const
 
 void wxSpinButton::SetValue(int val)
 {
 
 void wxSpinButton::SetValue(int val)
 {

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

 }
 
 void wxSpinButton::SetRange(int minVal, int maxVal)
 {
        m_min = minVal;
        m_max = maxVal;
 }
 
 void wxSpinButton::SetRange(int minVal, int maxVal)
 {
        m_min = minVal;
        m_max = maxVal;

-    SetControlMaximum( (ControlHandle) m_macControl , maxVal ) ;
-    SetControlMinimum((ControlHandle) m_macControl , minVal ) ;
+    SetControl32BitMaximum( (ControlHandle) m_macControl , maxVal ) ;
+    SetControl32BitMinimum((ControlHandle) m_macControl , minVal ) ;

 }
 
 void wxSpinButton::MacHandleValueChanged( int inc )
 }
 
 void wxSpinButton::MacHandleValueChanged( int inc )


@@ -118,9 +118,9 @@ void wxSpinButton::MacHandleValueChanged( int inc )
       m_value = m_max;
     }
 
       m_value = m_max;
     }
 

-    if ( oldValue - m_value == -1 )
+    if ( m_value - oldValue == -1 )

         scrollEvent = wxEVT_SCROLL_LINEDOWN ;
         scrollEvent = wxEVT_SCROLL_LINEDOWN ;

-    else if ( oldValue - m_value == 1 )
+    else if ( m_value - oldValue == 1 )

         scrollEvent = wxEVT_SCROLL_LINEUP ;
     else
         scrollEvent = wxEVT_SCROLL_THUMBTRACK ;
         scrollEvent = wxEVT_SCROLL_LINEUP ;
     else
         scrollEvent = wxEVT_SCROLL_THUMBTRACK ;


@@ -134,7 +134,7 @@ void wxSpinButton::MacHandleValueChanged( int inc )
     {
         m_value = oldValue ;
     }
     {
         m_value = oldValue ;
     }

-    SetControlValue( (ControlHandle) m_macControl , m_value ) ;
+    SetControl32BitValue( (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)