supporting readonly and singleline attributes for non-mlte textrcontrol

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

diff --git a/src/mac/carbon/spinbutt.cpp b/src/mac/carbon/spinbutt.cpp
index f8dcca8bd9ad8ab8c3e5a42cb6df012b01bbdd30..30d3076417770100db2e77ca232375ad40b2d1bb 100644 (file)
--- a/src/mac/carbon/spinbutt.cpp
+++ b/src/mac/carbon/spinbutt.cpp
@@ -38,6 +38,8 @@ wxSpinButton::wxSpinButton()
 bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
         long style, const wxString& name)
 {
 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;
     if ( !wxSpinButtonBase::Create(parent, id, pos, size,
                                    style, wxDefaultValidator, name) )
         return false;


@@ -48,17 +50,12 @@ bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, c
     if (!parent)
         return FALSE;
     
     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 ) ;
+    Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
+        
+    verify_noerr ( CreateLittleArrowsControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , 0 , m_min , m_max , 1 ,
+     (ControlRef*) &m_macControl ) ) ;

     
     

-    wxASSERT_MSG( (ControlHandle) m_macControl != NULL , wxT("No valid mac control") ) ;
-    
-    MacPostControlCreate() ;
+    MacPostControlCreate(pos,size) ;

     
     return TRUE;
 }
     
     return TRUE;
 }


@@ -94,8 +91,8 @@ void wxSpinButton::SetRange(int minVal, int maxVal)
 {
     m_min = minVal;
     m_max = 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 )
 }
 
 void wxSpinButton::MacHandleValueChanged( int inc )


@@ -138,7 +135,7 @@ void wxSpinButton::MacHandleValueChanged( int inc )
     {
         m_value = oldValue ;
     }
     {
         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)
     
     /* always send a thumbtrack event */
     if (scrollEvent != wxEVT_SCROLL_THUMBTRACK)


@@ -151,14 +148,12 @@ void wxSpinButton::MacHandleValueChanged( int inc )
     }
 }
 
     }
 }
 

-void wxSpinButton::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool WXUNUSED(mouseStillDown)) 
+wxInt32 wxSpinButton::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF event )  

 {
 {

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

     int nScrollInc = 0;
     int nScrollInc = 0;

+    wxMacCarbonEvent cEvent( (EventRef) event ) ;

     
     

-    switch( controlpart )
+    switch( cEvent.GetParameter<ControlPartCode>(kEventParamControlPart,typeControlPartCode) )

     {
     case kControlUpButtonPart :
         nScrollInc = 1;
     {
     case kControlUpButtonPart :
         nScrollInc = 1;


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

-    
+    return noErr ;

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