X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/37e2cb08cd1910ec5a14b38f0addfc6e2e8e172e..fa2f5d3bc9563c2b88282d5487758572d8baffb3:/src/mac/carbon/spinbutt.cpp diff --git a/src/mac/carbon/spinbutt.cpp b/src/mac/carbon/spinbutt.cpp index 944f72dc10..08151678ac 100644 --- a/src/mac/carbon/spinbutt.cpp +++ b/src/mac/carbon/spinbutt.cpp @@ -11,6 +11,7 @@ #ifdef __GNUG__ #pragma implementation "spinbutt.h" +#pragma implementation "spinbuttbase.h" #endif #include "wx/spinbutt.h" @@ -24,8 +25,15 @@ // wxWin macros // ---------------------------------------------------------------------------- +#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl) - IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent); + 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) @@ -41,10 +49,10 @@ bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, c MacPreControlCreate( parent , id , "" , pos , size ,style,*( (wxValidator*) NULL ) , name , &bounds , title ) ; - m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , 0 , 0 , 100, + m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 100, kControlLittleArrowsProc , (long) this ) ; - wxASSERT_MSG( m_macControl != NULL , "No valid mac control" ) ; + wxASSERT_MSG( (ControlHandle) m_macControl != NULL , "No valid mac control" ) ; MacPostControlCreate() ; @@ -58,6 +66,16 @@ wxSpinButton::~wxSpinButton() // Attributes //////////////////////////////////////////////////////////////////////////// +int wxSpinButton::GetMin() const +{ + return m_min; +} + +int wxSpinButton::GetMax() const +{ + return m_max; +} + int wxSpinButton::GetValue() const { return m_value; @@ -66,62 +84,87 @@ int wxSpinButton::GetValue() const void wxSpinButton::SetValue(int val) { m_value = val ; - wxScrollEvent event(wxEVT_SCROLL_THUMBTRACK, m_windowId); - - event.SetPosition(m_value); - event.SetEventObject( this ); - GetEventHandler()->ProcessEvent(event); } void wxSpinButton::SetRange(int minVal, int maxVal) { m_min = minVal; m_max = maxVal; + SetControl32BitMaximum( (ControlHandle) m_macControl , maxVal ) ; + SetControl32BitMinimum((ControlHandle) m_macControl , minVal ) ; +} + +void wxSpinButton::MacHandleValueChanged( int inc ) +{ + + wxEventType scrollEvent = wxEVT_NULL; + int oldValue = m_value ; + + m_value = oldValue + inc; + + if (m_value < m_min) + { + if ( m_windowStyle & wxSP_WRAP ) + m_value = m_max; + else + m_value = m_min; + } + + if (m_value > m_max) + { + if ( m_windowStyle & wxSP_WRAP ) + m_value = m_min; + 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 ; + + 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 (scrollEvent != wxEVT_SCROLL_THUMBTRACK) + { + scrollEvent = wxEVT_SCROLL_THUMBTRACK; + wxSpinEvent event2( scrollEvent, GetId()); + event2.SetPosition( m_value ); + event2.SetEventObject( this ); + GetEventHandler()->ProcessEvent( event2 ); + } } -void wxSpinButton::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) +void wxSpinButton::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) { - if ( m_macControl == NULL ) + if ( (ControlHandle) m_macControl == NULL ) return ; - wxEventType scrollEvent = wxEVT_NULL; - int nScrollInc; + int nScrollInc = 0; switch( controlpart ) { case kControlUpButtonPart : - nScrollInc = 1; - scrollEvent = wxEVT_SCROLL_LINEUP; + nScrollInc = 1; break ; case kControlDownButtonPart : - nScrollInc = -1; - scrollEvent = wxEVT_SCROLL_LINEDOWN; + nScrollInc = -1; break ; } + MacHandleValueChanged( nScrollInc ) ; - m_value = m_value + nScrollInc; - - if (m_value < m_min) - { - if ( m_windowStyle & wxSP_WRAP ) - m_value = m_max; - else - m_value = m_min; - } - - if (m_value > m_max) - { - if ( m_windowStyle & wxSP_WRAP ) - m_value = m_min; - else - m_value = m_max; - } - - wxScrollEvent event(scrollEvent, m_windowId); - - event.SetPosition(m_value); - event.SetEventObject( this ); - GetEventHandler()->ProcessEvent(event); } // ---------------------------------------------------------------------------- @@ -130,17 +173,6 @@ void wxSpinButton::MacHandleControlClick( ControlHandle control , SInt16 control wxSize wxSpinButton::DoGetBestSize() const { - if ( (GetWindowStyle() & wxSP_VERTICAL) != 0 ) - { - // vertical control - return wxSize(16, - 2*16); - } - else - { - // horizontal control - return wxSize(2*16, - 16); - } + return wxSize(16,24); }