continued spinning committed

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27535 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/mac/carbon/spinbutt.h b/include/wx/mac/carbon/spinbutt.h
index 8c9295a5d2efa05ca86ead04f02da73f37d13874..e7a85f5f0f4ec9e18acaa699787530de7c9d82e7 100644 (file)
--- a/include/wx/mac/carbon/spinbutt.h
+++ b/include/wx/mac/carbon/spinbutt.h
@@ -64,6 +64,7 @@ public:
 
     // implementation
     
 
     // implementation
     

+    virtual void MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;

     virtual wxInt32 MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ;
 
 protected:
     virtual wxInt32 MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ;
 
 protected:

diff --git a/src/mac/carbon/spinbutt.cpp b/src/mac/carbon/spinbutt.cpp
index 30d3076417770100db2e77ca232375ad40b2d1bb..7e8de83b09c60c7d45c2692c9f66947f6f5aaf5b 100644 (file)
--- a/src/mac/carbon/spinbutt.cpp
+++ b/src/mac/carbon/spinbutt.cpp
@@ -30,6 +30,8 @@
     IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent)
 #endif
 
     IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent)
 #endif
 

+extern ControlActionUPP wxMacLiveScrollbarActionUPP ;
+

 wxSpinButton::wxSpinButton()
    : wxSpinButtonBase()
 {
 wxSpinButton::wxSpinButton()
    : wxSpinButtonBase()
 {


@@ -54,7 +56,7 @@ bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, c
         
     verify_noerr ( CreateLittleArrowsControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , 0 , m_min , m_max , 1 ,
      (ControlRef*) &m_macControl ) ) ;
         
     verify_noerr ( CreateLittleArrowsControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , 0 , m_min , m_max , 1 ,
      (ControlRef*) &m_macControl ) ) ;

-    
+    SetControlAction( (ControlRef) m_macControl , wxMacLiveScrollbarActionUPP ) ;

     MacPostControlCreate(pos,size) ;
     
     return TRUE;
     MacPostControlCreate(pos,size) ;
     
     return TRUE;


@@ -148,8 +150,26 @@ void wxSpinButton::MacHandleValueChanged( int inc )
     }
 }
 
     }
 }
 

+void wxSpinButton::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) 
+{
+    int nScrollInc = 0;
+    
+    switch( controlpart )
+    {
+    case kControlUpButtonPart :
+        nScrollInc = 1;
+        break ;
+    case kControlDownButtonPart :
+        nScrollInc = -1;
+        break ;
+    }
+    MacHandleValueChanged( nScrollInc ) ;
+}
+

 wxInt32 wxSpinButton::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF event )  
 {
 wxInt32 wxSpinButton::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF event )  
 {

+    /*
+    // these have been handled by the live action proc already

     int nScrollInc = 0;
     wxMacCarbonEvent cEvent( (EventRef) event ) ;
     
     int nScrollInc = 0;
     wxMacCarbonEvent cEvent( (EventRef) event ) ;
     


@@ -163,6 +183,7 @@ wxInt32 wxSpinButton::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVEN
         break ;
     }
     MacHandleValueChanged( nScrollInc ) ;
         break ;
     }
     MacHandleValueChanged( nScrollInc ) ;

+    */

     return noErr ;
 }
 
     return noErr ;
 }