Yet more fixes for wxNotebook compatibility...

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

diff --git a/src/mac/carbon/spinbutt.cpp b/src/mac/carbon/spinbutt.cpp
index f8dcca8bd9ad8ab8c3e5a42cb6df012b01bbdd30..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
 
+extern ControlActionUPP wxMacLiveScrollbarActionUPP ;
+
 wxSpinButton::wxSpinButton()
    : wxSpinButtonBase()
 {
@@ -38,6 +40,8 @@ wxSpinButton::wxSpinButton()
 bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
         long style, const wxString& name)
 {
+    m_macIsUserPane = FALSE ;
+    
     if ( !wxSpinButtonBase::Create(parent, id, pos, size,
                                    style, wxDefaultValidator, name) )
         return false;
@@ -48,17 +52,12 @@ bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, c
     if (!parent)
         return FALSE;
     
-    Rect bounds ;
-    Str255 title ;
-    
-    MacPreControlCreate( parent , id ,  wxEmptyString , pos , size ,style,*( (wxValidator*) NULL ) , name , &bounds , title ) ;
-    
-    m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 100, 
-        kControlLittleArrowsProc , (long) this ) ;
-    
-    wxASSERT_MSG( (ControlHandle) m_macControl != NULL , wxT("No valid mac control") ) ;
-    
-    MacPostControlCreate() ;
+    Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
+        
+    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;
 }
@@ -94,8 +93,8 @@ void wxSpinButton::SetRange(int minVal, int maxVal)
 {
     m_min = minVal;
     m_max = maxVal;
-    SetControl32BitMaximum( (ControlHandle) m_macControl , maxVal ) ;
-    SetControl32BitMinimum((ControlHandle) m_macControl , minVal ) ;
+    SetControl32BitMaximum( (ControlRef) m_macControl , maxVal ) ;
+    SetControl32BitMinimum((ControlRef) m_macControl , minVal ) ;
 }
 
 void wxSpinButton::MacHandleValueChanged( int inc )
@@ -138,7 +137,7 @@ void wxSpinButton::MacHandleValueChanged( int inc )
     {
         m_value = oldValue ;
     }
-    SetControl32BitValue( (ControlHandle) m_macControl , m_value ) ;
+    SetControl32BitValue( (ControlRef) m_macControl , m_value ) ;
     
     /* always send a thumbtrack event */
     if (scrollEvent != wxEVT_SCROLL_THUMBTRACK)
@@ -151,11 +150,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 ( (ControlHandle) m_macControl == NULL )
-        return ;
-    
     int nScrollInc = 0;
     
     switch( controlpart )
@@ -168,7 +164,27 @@ void wxSpinButton::MacHandleControlClick( WXWidget control , wxInt16 controlpart
         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 ;
 }
 
 // ----------------------------------------------------------------------------