X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..e11898f903183f897a2b2a50a4447ea73ba7273f:/src/mac/carbon/slider.cpp diff --git a/src/mac/carbon/slider.cpp b/src/mac/carbon/slider.cpp index 214d46c808..0c73cb27bf 100644 --- a/src/mac/carbon/slider.cpp +++ b/src/mac/carbon/slider.cpp @@ -6,13 +6,17 @@ // Created: 1998-01-01 // RCS-ID: $Id$ // Copyright: (c) Stefan Csomor -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ #pragma implementation "slider.h" #endif +#include "wx/defs.h" + +#if wxUSE_SLIDER + #include "wx/slider.h" #include "wx/mac/uma.h" @@ -27,15 +31,15 @@ END_EVENT_TABLE() #define wxSLIDER_DIMENSIONACROSS 15 #define wxSLIDER_DIMENSIONACROSS_WITHTICKMARKS 24 #define wxSLIDER_DIMENSIONACROSS_ARROW 18 - + // Distance between slider and text #define wxSLIDER_BORDERTEXT 5 - + /* NB! The default orientation for a slider is horizontal however if the user specifies * some slider styles but dosen't specify the orientation we have to assume he wants a * horizontal one. Therefore in this file when testing for the sliders orientation * vertical is tested for if this is not set then we use the horizontal one - * eg. if(GetWindowStyle() & wxSL_VERTICAL) {} else { horizontal case }> + * eg. if(GetWindowStyle() & wxSL_VERTICAL) {} else { horizontal case }> */ // Slider @@ -57,34 +61,39 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id, const wxValidator& validator, const wxString& name) { - m_macIsUserPane = FALSE ; - + m_macIsUserPane = false ; + if ( !wxControl::Create(parent, id, pos, size, style, validator, name) ) return false; m_macMinimumStatic = NULL ; m_macMaximumStatic = NULL ; m_macValueStatic = NULL ; - - + + m_lineSize = 1; m_tickFreq = 0; - + m_rangeMax = maxValue; m_rangeMin = minValue; - + m_pageSize = (int)((maxValue-minValue)/10); - - Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ; - + + Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ; + UInt16 tickMarks = 0 ; if ( style & wxSL_AUTOTICKS ) - tickMarks = maxValue - minValue ; - - verify_noerr ( CreateSliderControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , + tickMarks = (maxValue - minValue); + + if (tickMarks > 20) + tickMarks = tickMarks/5; //keep the number of tickmarks from becoming unwieldly + + m_peer = new wxMacControl() ; + verify_noerr ( CreateSliderControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , value , minValue , maxValue , kControlSliderPointsDownOrRight , tickMarks , true /* liveTracking */ , - wxMacLiveScrollbarActionUPP , (ControlRef*) &m_macControl ) ) ; - + wxMacLiveScrollbarActionUPP , m_peer->GetControlRefAddr() ) ); + + if(style & wxSL_VERTICAL) { SetSizeHints(10, -1, 10, -1); // Forces SetSize to use the proper width } @@ -94,18 +103,18 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id, // NB! SetSizeHints is overloaded by wxSlider and will substitute 10 with the // proper dimensions, it also means other people cannot bugger the slider with // other values - + if(style & wxSL_LABELS) { - m_macMinimumStatic = new wxStaticText( parent, -1, wxEmptyString ); - m_macMaximumStatic = new wxStaticText( parent, -1, wxEmptyString ); - m_macValueStatic = new wxStaticText( parent, -1, wxEmptyString ); + m_macMinimumStatic = new wxStaticText( parent, wxID_ANY, wxEmptyString ); + m_macMaximumStatic = new wxStaticText( parent, wxID_ANY, wxEmptyString ); + m_macValueStatic = new wxStaticText( parent, wxID_ANY, wxEmptyString ); SetRange(minValue, maxValue); SetValue(value); } MacPostControlCreate(pos,size) ; - + return true; } @@ -118,28 +127,28 @@ wxSlider::~wxSlider() int wxSlider::GetValue() const { - return GetControl32BitValue( (ControlRef) m_macControl) ; + return m_peer->GetValue() ; } void wxSlider::SetValue(int value) { wxString valuestring ; - valuestring.Printf( wxT("%d") , value ) ; + valuestring.Printf( wxT("%d") , value ) ; if ( m_macValueStatic ) m_macValueStatic->SetLabel( valuestring ) ; - SetControl32BitValue( (ControlRef) m_macControl , value ) ; + m_peer->SetValue( value ) ; } void wxSlider::SetRange(int minValue, int maxValue) { wxString value; - + m_rangeMin = minValue; m_rangeMax = maxValue; - - SetControl32BitMinimum( (ControlRef) m_macControl, m_rangeMin); - SetControl32BitMaximum( (ControlRef) m_macControl, m_rangeMax); - + + m_peer->SetMinimum( m_rangeMin); + m_peer->SetMaximum( m_rangeMax); + if(m_macMinimumStatic) { value.Printf(wxT("%d"), m_rangeMin); m_macMinimumStatic->SetLabel(value); @@ -230,47 +239,47 @@ void wxSlider::Command (wxCommandEvent & event) ProcessCommand (event); } -void wxSlider::MacHandleControlClick( WXWidget control , wxInt16 controlpart, bool mouseStillDown ) +void wxSlider::MacHandleControlClick( WXWidget control , wxInt16 controlpart, bool mouseStillDown ) { - SInt16 value = ::GetControl32BitValue( (ControlRef) m_macControl ) ; - - SetValue( value ) ; - + SInt16 value = m_peer->GetValue() ; + + SetValue( value ) ; + wxEventType scrollEvent = wxEVT_NULL ; - + scrollEvent = wxEVT_SCROLL_THUMBTRACK; - + wxScrollEvent event(scrollEvent, m_windowId); event.SetPosition(value); event.SetEventObject( this ); GetEventHandler()->ProcessEvent(event); - + wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, m_windowId ); cevent.SetInt( value ); cevent.SetEventObject( this ); - + GetEventHandler()->ProcessEvent( cevent ); } -wxInt32 wxSlider::MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF mevent ) +wxInt32 wxSlider::MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF mevent ) { - SInt16 value = ::GetControl32BitValue( (ControlRef) m_macControl ) ; - - SetValue( value ) ; - + SInt16 value = m_peer->GetValue() ; + + SetValue( value ) ; + wxEventType scrollEvent = wxEVT_NULL ; - + scrollEvent = wxEVT_SCROLL_THUMBRELEASE; - + wxScrollEvent event(scrollEvent, m_windowId); event.SetPosition(value); event.SetEventObject( this ); GetEventHandler()->ProcessEvent(event); - + wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, m_windowId ); cevent.SetInt( value ); cevent.SetEventObject( this ); - + GetEventHandler()->ProcessEvent( cevent ); return noErr ; } @@ -283,7 +292,7 @@ void wxSlider::SetSizeHints( int minW, int minH, int incW , int incH ) { wxSize size = GetBestSize(); - + if(GetWindowStyle() & wxSL_VERTICAL) { wxWindow::SetSizeHints(size.x, minH, size.x, maxH, incW, incH); } @@ -296,12 +305,12 @@ wxSize wxSlider::DoGetBestSize() const { wxSize size; int textwidth, textheight; - + if(GetWindowStyle() & wxSL_LABELS) { wxString text; int ht, wd; - + // Get maximum text label width and height text.Printf(wxT("%d"), m_rangeMin); GetTextExtent(text, &textwidth, &textheight); @@ -314,7 +323,7 @@ wxSize wxSlider::DoGetBestSize() const textwidth = wd; } } - + if(GetWindowStyle() & wxSL_VERTICAL) { if(GetWindowStyle() & wxSL_AUTOTICKS) { @@ -349,14 +358,21 @@ void wxSlider::DoSetSize(int x, int y, int w, int h, int sizeFlags) int xborder, yborder; int minValWidth, maxValWidth, textwidth, textheight; int sliderBreadth; - + xborder = yborder = 0; - + if (GetWindowStyle() & wxSL_LABELS) { + //Labels have this control's parent as their parent + //so if this control is not at 0,0 relative to the parent + //the labels need to know the position of this control + //relative to its parent in order to size properly, so + //move the control first so we can use GetPosition() + wxControl::DoSetSize( x, y , w , h ,sizeFlags ) ; + wxString text; int ht; - + // Get maximum text label width and height text.Printf(wxT("%d"), m_rangeMin); GetTextExtent(text, &minValWidth, &textheight); @@ -366,10 +382,10 @@ void wxSlider::DoSetSize(int x, int y, int w, int h, int sizeFlags) textheight = ht; } textwidth = (minValWidth > maxValWidth ? minValWidth : maxValWidth); - + xborder = textwidth + wxSLIDER_BORDERTEXT; yborder = textheight + wxSLIDER_BORDERTEXT; - + // Get slider breadth if(GetWindowStyle() & wxSL_AUTOTICKS) { sliderBreadth = wxSLIDER_DIMENSIONACROSS_WITHTICKMARKS; @@ -377,36 +393,40 @@ void wxSlider::DoSetSize(int x, int y, int w, int h, int sizeFlags) else { sliderBreadth = wxSLIDER_DIMENSIONACROSS_ARROW; } - + if(GetWindowStyle() & wxSL_VERTICAL) { - + h = h - yborder ; + if ( m_macMinimumStatic ) - m_macMinimumStatic->Move(x + sliderBreadth + wxSLIDER_BORDERTEXT, - y + h - yborder - textheight); + m_macMinimumStatic->Move(GetPosition().x + sliderBreadth + wxSLIDER_BORDERTEXT, + GetPosition().y + h - yborder); if ( m_macMaximumStatic ) - m_macMaximumStatic->Move(x + sliderBreadth + wxSLIDER_BORDERTEXT, y + 0); + m_macMaximumStatic->Move(GetPosition().x + sliderBreadth + wxSLIDER_BORDERTEXT, GetPosition().y + 0); if ( m_macValueStatic ) - m_macValueStatic->Move(0, y + h - textheight); - h = h - yborder ; + m_macValueStatic->Move(GetPosition().x, GetPosition().y + h ); } else { + w = w - xborder ; if ( m_macMinimumStatic ) - m_macMinimumStatic->Move(x + 0, y + sliderBreadth + wxSLIDER_BORDERTEXT); + m_macMinimumStatic->Move(GetPosition().x + 0, GetPosition().y + sliderBreadth + wxSLIDER_BORDERTEXT); if ( m_macMaximumStatic ) - m_macMaximumStatic->Move(x + w - xborder - maxValWidth / 2, - y + sliderBreadth + wxSLIDER_BORDERTEXT); + m_macMaximumStatic->Move(GetPosition().x + w - (maxValWidth/2), + GetPosition().y + sliderBreadth + wxSLIDER_BORDERTEXT); if ( m_macValueStatic ) - m_macValueStatic->Move(x + w - textwidth, y + 0); - w = w - xborder ; + m_macValueStatic->Move(GetPosition().x + w, GetPosition().y + 0); } } - + //If the control has labels, we still need to call this again because + //the labels alter the control's w and h values. wxControl::DoSetSize( x, y , w , h ,sizeFlags ) ; + } void wxSlider::DoMoveWindow(int x, int y, int width, int height) { wxControl::DoMoveWindow(x,y,width,height) ; } + +#endif // wxUSE_SLIDER