X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a31a5f85341a2ef131d86a1dee12f3d6c8156118..7ad25aed02fa53612cd94a422904667c46fafcbb:/src/mac/carbon/spinbutt.cpp diff --git a/src/mac/carbon/spinbutt.cpp b/src/mac/carbon/spinbutt.cpp index 85fd2d0b08..2b900c19fd 100644 --- a/src/mac/carbon/spinbutt.cpp +++ b/src/mac/carbon/spinbutt.cpp @@ -6,13 +6,12 @@ // Created: 1998-01-01 // RCS-ID: $Id$ // Copyright: (c) Stefan Csomor -// Licence: wxWindows licence +// 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" @@ -25,10 +24,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() @@ -36,27 +33,30 @@ wxSpinButton::wxSpinButton() } bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, - long style, const wxString& name) + 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 , "" , pos , size ,style,*( (wxValidator*) NULL ) , name , &bounds , title ) ; + if (!parent) + return false; - m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , 0 , 100, - kControlLittleArrowsProc , (long) this ) ; - - wxASSERT_MSG( (ControlHandle) m_macControl != NULL , "No valid mac control" ) ; + Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ; - MacPostControlCreate() ; + m_peer = new wxMacControl(this) ; + verify_noerr ( CreateLittleArrowsControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , 0 , m_min , m_max , 1 , + m_peer->GetControlRefAddr() ) ); - return TRUE; + m_peer->SetActionProc( GetwxMacLiveScrollbarActionProc() ) ; + MacPostControlCreate(pos,size) ; + + return true; } wxSpinButton::~wxSpinButton() @@ -68,54 +68,59 @@ wxSpinButton::~wxSpinButton() int wxSpinButton::GetMin() const { - return m_min; + return m_min; } int wxSpinButton::GetMax() const { - return m_max; + return m_max; } 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) { - 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_min = minVal; + m_max = maxVal; + 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 ) - m_value = m_max; - else - 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_windowStyle & wxSP_WRAP ) + m_value = m_min; + else + m_value = m_max; } if ( m_value - oldValue == -1 ) @@ -124,7 +129,7 @@ void wxSpinButton::MacHandleValueChanged( int inc ) scrollEvent = wxEVT_SCROLL_LINEUP ; else scrollEvent = wxEVT_SCROLL_THUMBTRACK ; - + wxSpinEvent event(scrollEvent, m_windowId); event.SetPosition(m_value); @@ -134,7 +139,7 @@ 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,24 +152,41 @@ 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 : - nScrollInc = 1; - break ; - case kControlDownButtonPart : - nScrollInc = -1; - break ; - } - MacHandleValueChanged( nScrollInc ) ; + int nScrollInc = 0; + + switch( controlpart ) + { + case kControlUpButtonPart : + nScrollInc = 1; + break ; + case kControlDownButtonPart : + nScrollInc = -1; + 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 ; } // ---------------------------------------------------------------------------- @@ -173,6 +195,7 @@ void wxSpinButton::MacHandleControlClick( WXWidget control , wxInt16 controlpart wxSize wxSpinButton::DoGetBestSize() const { - return wxSize(16,24); + return wxSize(16,24); } +#endif // wxUSE_SPINBTN