X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4b26b60fac70f89cf33935f78469e27536d8b614..ded83b1a5cebd3c1257f4d254c97d3cfb39bb5aa:/src/mac/carbon/spinbutt.cpp

diff --git a/src/mac/carbon/spinbutt.cpp b/src/mac/carbon/spinbutt.cpp
index 57a2a4a0d7..560ab64352 100644
--- a/src/mac/carbon/spinbutt.cpp
+++ b/src/mac/carbon/spinbutt.cpp
@@ -9,63 +9,56 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#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"
 
-// ============================================================================
-// implementation
-// ============================================================================
 
-// ----------------------------------------------------------------------------
-// wxWin macros
-// ----------------------------------------------------------------------------
+IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent)
 
-#if !USE_SHARED_LIBRARY
-    IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl)
-    IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent)
-#endif
 
 wxSpinButton::wxSpinButton()
    : wxSpinButtonBase()
 {
 }
 
-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;
+
     m_min = 0;
     m_max = 100;
-    
+
     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() ;
-    
-    return TRUE;
+        return false;
+
+    Rect bounds = wxMacGetBoundsForControl( this , pos , size );
+
+    m_peer = new wxMacControl( this );
+    OSStatus err = CreateLittleArrowsControl(
+        MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds, 0, m_min, m_max, 1,
+        m_peer->GetControlRefAddr() );
+    verify_noerr( err );
+
+    m_peer->SetActionProc( GetwxMacLiveScrollbarActionProc() );
+    MacPostControlCreate( pos, size );
+
+    return true;
 }
-    
+
 wxSpinButton::~wxSpinButton()
 {
 }
 
-// Attributes
-////////////////////////////////////////////////////////////////////////////
-
 int wxSpinButton::GetMin() const
 {
     return m_min;
@@ -78,30 +71,36 @@ int wxSpinButton::GetMax() const
 
 int wxSpinButton::GetValue() const
 {
-    return m_value;
+    int n = m_value;
+
+    if (n < m_min)
+        n = m_min;
+    else if (n > m_max)
+        n = m_max;
+
+    return n;
 }
 
 void wxSpinButton::SetValue(int val)
 {
-    m_value = val ;
+    m_value = val;
 }
 
 void wxSpinButton::SetRange(int minVal, int maxVal)
 {
     m_min = minVal;
     m_max = maxVal;
-    SetControl32BitMaximum( (ControlHandle) m_macControl , maxVal ) ;
-    SetControl32BitMinimum((ControlHandle) m_macControl , minVal ) ;
+    m_peer->SetMaximum( maxVal );
+    m_peer->SetMinimum( minVal );
 }
 
 void wxSpinButton::MacHandleValueChanged( int inc )
 {
-    
     wxEventType scrollEvent = wxEVT_NULL;
-    int oldValue = m_value ;
-    
+    int oldValue = m_value;
+
     m_value = oldValue + inc;
-    
+
     if (m_value < m_min)
     {
         if ( m_windowStyle & wxSP_WRAP )
@@ -109,7 +108,7 @@ void wxSpinButton::MacHandleValueChanged( int inc )
         else
             m_value = m_min;
     }
-    
+
     if (m_value > m_max)
     {
         if ( m_windowStyle & wxSP_WRAP )
@@ -117,62 +116,85 @@ void wxSpinButton::MacHandleValueChanged( int inc )
         else
             m_value = m_max;
     }
-    
+
     if ( m_value - oldValue == -1 )
-        scrollEvent = wxEVT_SCROLL_LINEDOWN ;
+        scrollEvent = wxEVT_SCROLL_LINEDOWN;
     else if ( m_value - oldValue == 1 )
-        scrollEvent = wxEVT_SCROLL_LINEUP ;
+        scrollEvent = wxEVT_SCROLL_LINEUP;
     else
-        scrollEvent = wxEVT_SCROLL_THUMBTRACK ;
-    
-    wxSpinEvent event(scrollEvent, m_windowId);
-    
-    event.SetPosition(m_value);
+        scrollEvent = wxEVT_SCROLL_THUMBTRACK;
+
+    wxSpinEvent event( scrollEvent, m_windowId );
+
+    event.SetPosition( m_value );
     event.SetEventObject( this );
-    if ((GetEventHandler()->ProcessEvent( event )) &&
-        !event.IsAllowed() )
-    {
-        m_value = oldValue ;
-    }
-    SetControl32BitValue( (ControlHandle) m_macControl , m_value ) ;
-    
-    /* always send a thumbtrack event */
+    if ((GetEventHandler()->ProcessEvent( event )) && !event.IsAllowed())
+        m_value = oldValue;
+
+    m_peer->SetValue( m_value );
+
+    // always send a thumbtrack event
     if (scrollEvent != wxEVT_SCROLL_THUMBTRACK)
     {
         scrollEvent = wxEVT_SCROLL_THUMBTRACK;
-        wxSpinEvent event2( scrollEvent, GetId());
+        wxSpinEvent event2( scrollEvent, GetId() );
         event2.SetPosition( m_value );
         event2.SetEventObject( this );
         GetEventHandler()->ProcessEvent( event2 );
     }
 }
 
-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 )
+
+    switch ( controlpart )
     {
     case kControlUpButtonPart :
         nScrollInc = 1;
-        break ;
+        break;
+
     case kControlDownButtonPart :
         nScrollInc = -1;
-        break ;
+        break;
+
+    default:
+        break;
     }
+
     MacHandleValueChanged( nScrollInc ) ;
-    
 }
 
-// ----------------------------------------------------------------------------
-// size calculation
-// ----------------------------------------------------------------------------
+wxInt32 wxSpinButton::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF event )
+{
+#if 0
+    // 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;
+
+    default :
+        break;
+    }
+
+    MacHandleValueChanged( nScrollInc ) ;
+#endif
+
+    return noErr;
+}
 
 wxSize wxSpinButton::DoGetBestSize() const
 {
-    return wxSize(16,24);
+    return wxSize( 16, 24 );
 }
 
+#endif // wxUSE_SPINBTN