otherwise we always fall back to blitting, even if we can provide better results

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

diff --git a/src/mac/carbon/spinbutt.cpp b/src/mac/carbon/spinbutt.cpp
index 7e8de83b09c60c7d45c2692c9f66947f6f5aaf5b..c50ab73d6f5849de0252d347b1bdb784b2284b3a 100644 (file)
--- a/src/mac/carbon/spinbutt.cpp
+++ b/src/mac/carbon/spinbutt.cpp
@@ -9,11 +9,15 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "spinbutt.h"
 #pragma implementation "spinbuttbase.h"
 #endif
 
 #pragma implementation "spinbutt.h"
 #pragma implementation "spinbuttbase.h"
 #endif
 

+#include "wx/wxprec.h"
+
+#if wxUSE_SPINBTN
+

 #include "wx/spinbutt.h"
 #include "wx/mac/uma.h"
 
 #include "wx/spinbutt.h"
 #include "wx/mac/uma.h"
 


@@ -30,8 +34,6 @@
     IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent)
 #endif
 
     IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent)
 #endif
 

-extern ControlActionUPP wxMacLiveScrollbarActionUPP ;
-

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


@@ -40,28 +42,30 @@ 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 ;
-    
+    m_macIsUserPane = false ;
+

     if ( !wxSpinButtonBase::Create(parent, id, pos, size,
                                    style, wxDefaultValidator, name) )
         return false;
 
     m_min = 0;
     m_max = 100;
     if ( !wxSpinButtonBase::Create(parent, id, pos, size,
                                    style, wxDefaultValidator, name) )
         return false;
 
     m_min = 0;
     m_max = 100;

-    
+

     if (!parent)
     if (!parent)

-        return FALSE;
-    
+        return false;
+

     Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
     Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;

-        
+
+    m_peer = new wxMacControl(this) ;

     verify_noerr ( CreateLittleArrowsControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , 0 , m_min , m_max , 1 ,
     verify_noerr ( CreateLittleArrowsControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , 0 , m_min , m_max , 1 ,

-     (ControlRef*) &m_macControl ) ) ;
-    SetControlAction( (ControlRef) m_macControl , wxMacLiveScrollbarActionUPP ) ;
+     m_peer->GetControlRefAddr() ) );
+
+    m_peer->SetActionProc( GetwxMacLiveScrollbarActionProc() ) ;

     MacPostControlCreate(pos,size) ;
     MacPostControlCreate(pos,size) ;

-    
-    return TRUE;
+
+    return true;

 }
 }

-    
+

 wxSpinButton::~wxSpinButton()
 {
 }
 wxSpinButton::~wxSpinButton()
 {
 }


@@ -81,7 +85,12 @@ int wxSpinButton::GetMax() const
 
 int wxSpinButton::GetValue() const
 {
 
 int wxSpinButton::GetValue() const
 {

-    return m_value;
+    int n = m_value;
+
+    if (n < m_min) n = m_min;
+    if (n > m_max) n = m_max;
+
+    return n;

 }
 
 void wxSpinButton::SetValue(int val)
 }
 
 void wxSpinButton::SetValue(int val)


@@ -93,18 +102,18 @@ 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 )
 {

-    
+

     wxEventType scrollEvent = wxEVT_NULL;
     int oldValue = m_value ;
     wxEventType scrollEvent = wxEVT_NULL;
     int oldValue = m_value ;

-    
+

     m_value = oldValue + inc;
     m_value = oldValue + inc;

-    
+

     if (m_value < m_min)
     {
         if ( m_windowStyle & wxSP_WRAP )
     if (m_value < m_min)
     {
         if ( m_windowStyle & wxSP_WRAP )


@@ -112,7 +121,7 @@ void wxSpinButton::MacHandleValueChanged( int inc )
         else
             m_value = m_min;
     }
         else
             m_value = m_min;
     }

-    
+

     if (m_value > m_max)
     {
         if ( m_windowStyle & wxSP_WRAP )
     if (m_value > m_max)
     {
         if ( m_windowStyle & wxSP_WRAP )


@@ -120,16 +129,16 @@ void wxSpinButton::MacHandleValueChanged( int inc )
         else
             m_value = m_max;
     }
         else
             m_value = m_max;
     }

-    
+

     if ( m_value - oldValue == -1 )
         scrollEvent = wxEVT_SCROLL_LINEDOWN ;
     else if ( m_value - oldValue == 1 )
         scrollEvent = wxEVT_SCROLL_LINEUP ;
     else
         scrollEvent = wxEVT_SCROLL_THUMBTRACK ;
     if ( m_value - oldValue == -1 )
         scrollEvent = wxEVT_SCROLL_LINEDOWN ;
     else if ( m_value - oldValue == 1 )
         scrollEvent = wxEVT_SCROLL_LINEUP ;
     else
         scrollEvent = wxEVT_SCROLL_THUMBTRACK ;

-    
+

     wxSpinEvent event(scrollEvent, m_windowId);
     wxSpinEvent event(scrollEvent, m_windowId);

-    
+

     event.SetPosition(m_value);
     event.SetEventObject( this );
     if ((GetEventHandler()->ProcessEvent( event )) &&
     event.SetPosition(m_value);
     event.SetEventObject( this );
     if ((GetEventHandler()->ProcessEvent( event )) &&


@@ -137,8 +146,8 @@ 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,10 +159,10 @@ void wxSpinButton::MacHandleValueChanged( int inc )
     }
 }
 
     }
 }
 

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

 {
     int nScrollInc = 0;
 {
     int nScrollInc = 0;

-    
+

     switch( controlpart )
     {
     case kControlUpButtonPart :
     switch( controlpart )
     {
     case kControlUpButtonPart :


@@ -166,13 +175,13 @@ void wxSpinButton::MacHandleControlClick( WXWidget control , wxInt16 controlpart
     MacHandleValueChanged( nScrollInc ) ;
 }
 
     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 ) ;
 {
     /*
     // 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 :
     switch( cEvent.GetParameter<ControlPartCode>(kEventParamControlPart,typeControlPartCode) )
     {
     case kControlUpButtonPart :


@@ -196,3 +205,4 @@ wxSize wxSpinButton::DoGetBestSize() const
     return wxSize(16,24);
 }
 
     return wxSize(16,24);
 }
 

+#endif // wxUSE_SPINBTN