added trailing slash

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

diff --git a/src/mac/carbon/spinbutt.cpp b/src/mac/carbon/spinbutt.cpp
index c9140dc6260a0d34eb9836f3bc7497157366fb32..98272dc92a3a5d67841a1be83321332f34a6430b 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()
 {


@@ -51,12 +53,12 @@ bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, c
         return FALSE;
     
     Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
         return FALSE;
     
     Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;

+        
+    m_peer = new wxMacControl() ;
+    verify_noerr ( CreateLittleArrowsControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , 0 , m_min , m_max , 1 ,
+     m_peer->GetControlRefAddr() ) );

     
     

-    m_macControl = (WXWidget) ::NewControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , "\p" , true , 0 , 0 , 100, 
-        kControlLittleArrowsProc , (long) this ) ;
-    
-    wxASSERT_MSG( (ControlRef) m_macControl != NULL , wxT("No valid mac control") ) ;
-    
+    m_peer->SetActionProc( wxMacLiveScrollbarActionUPP ) ;

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


@@ -93,8 +95,8 @@ void wxSpinButton::SetRange(int minVal, int maxVal)
 {
     m_min = minVal;
     m_max = maxVal;
 {
     m_min = minVal;
     m_max = maxVal;

-    SetControl32BitMaximum( (ControlRef) m_macControl , maxVal ) ;
-    SetControl32BitMinimum((ControlRef) m_macControl , minVal ) ;
+    m_peer->SetMaximum( maxVal ) ;
+    m_peer->SetMinimum( minVal ) ;

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


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

-    SetControl32BitValue( (ControlRef) m_macControl , m_value ) ;
+    m_peer->SetValue( m_value ) ;

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


@@ -150,11 +152,8 @@ void wxSpinButton::MacHandleValueChanged( int inc )
     }
 }
 
     }
 }
 

-void wxSpinButton::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool WXUNUSED(mouseStillDown)) 
+void wxSpinButton::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) 

 {
 {

-    if ( (ControlRef) m_macControl == NULL )
-        return ;
-    

     int nScrollInc = 0;
     
     switch( controlpart )
     int nScrollInc = 0;
     
     switch( controlpart )


@@ -167,7 +166,27 @@ void wxSpinButton::MacHandleControlClick( WXWidget control , wxInt16 controlpart
         break ;
     }
     MacHandleValueChanged( nScrollInc ) ;
         break ;
     }
     MacHandleValueChanged( nScrollInc ) ;

+}
+
+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 ) ;

     
     

+    switch( cEvent.GetParameter<ControlPartCode>(kEventParamControlPart,typeControlPartCode) )
+    {
+    case kControlUpButtonPart :
+        nScrollInc = 1;
+        break ;
+    case kControlDownButtonPart :
+        nScrollInc = -1;
+        break ;
+    }
+    MacHandleValueChanged( nScrollInc ) ;
+    */
+    return noErr ;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------