X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/427ff66291af2d8dd34ff5ee68c81436997144a1..d0ee33f5c6908b4ac5e1364381f0ef00942e3936:/src/mac/carbon/spinbutt.cpp?ds=sidebyside diff --git a/src/mac/carbon/spinbutt.cpp b/src/mac/carbon/spinbutt.cpp index 0f4faca578..a4645d88f3 100644 --- a/src/mac/carbon/spinbutt.cpp +++ b/src/mac/carbon/spinbutt.cpp @@ -9,11 +9,15 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #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" @@ -25,10 +29,8 @@ // wxWin macros // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY - IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl) - IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent) -#endif +IMPLEMENT_DYNAMIC_CLASS(wxSpinButton, wxControl) +IMPLEMENT_DYNAMIC_CLASS(wxSpinEvent, wxScrollEvent) wxSpinButton::wxSpinButton() : wxSpinButtonBase() @@ -38,27 +40,30 @@ 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; + 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) ; + verify_noerr ( CreateLittleArrowsControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , 0 , m_min , m_max , 1 , + m_peer->GetControlRefAddr() ) ); + + m_peer->SetActionProc( GetwxMacLiveScrollbarActionProc() ) ; + MacPostControlCreate(pos,size) ; + + return true; } - + wxSpinButton::~wxSpinButton() { } @@ -78,7 +83,12 @@ int wxSpinButton::GetMax() 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) @@ -90,18 +100,18 @@ 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 ; - + m_value = oldValue + inc; - + if (m_value < m_min) { if ( m_windowStyle & wxSP_WRAP ) @@ -109,7 +119,7 @@ void wxSpinButton::MacHandleValueChanged( int inc ) else m_value = m_min; } - + if (m_value > m_max) { if ( m_windowStyle & wxSP_WRAP ) @@ -117,16 +127,16 @@ void wxSpinButton::MacHandleValueChanged( int inc ) 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 )) && @@ -134,8 +144,8 @@ void wxSpinButton::MacHandleValueChanged( int inc ) { m_value = oldValue ; } - SetControl32BitValue( (ControlHandle) m_macControl , m_value ) ; - + m_peer->SetValue( m_value ) ; + /* always send a thumbtrack event */ if (scrollEvent != wxEVT_SCROLL_THUMBTRACK) { @@ -147,13 +157,10 @@ void wxSpinButton::MacHandleValueChanged( int inc ) } } -void wxSpinButton::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) +void wxSpinButton::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) { - if ( (ControlHandle) m_macControl == NULL ) - return ; - int nScrollInc = 0; - + switch( controlpart ) { case kControlUpButtonPart : @@ -164,7 +171,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(kEventParamControlPart,typeControlPartCode) ) + { + case kControlUpButtonPart : + nScrollInc = 1; + break ; + case kControlDownButtonPart : + nScrollInc = -1; + break ; + } + MacHandleValueChanged( nScrollInc ) ; + */ + return noErr ; } // ---------------------------------------------------------------------------- @@ -176,3 +203,4 @@ wxSize wxSpinButton::DoGetBestSize() const return wxSize(16,24); } +#endif // wxUSE_SPINBTN