X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/904ffc03c2969cd4ab243f30b1d29ac001ff3feb..c4807c0a8fdce8c8a21f7296cc224c08297ca54b:/src/mac/carbon/slider.cpp diff --git a/src/mac/carbon/slider.cpp b/src/mac/carbon/slider.cpp index 6080397266..484c775e73 100644 --- a/src/mac/carbon/slider.cpp +++ b/src/mac/carbon/slider.cpp @@ -22,21 +22,17 @@ BEGIN_EVENT_TABLE(wxSlider, wxControl) END_EVENT_TABLE() // The dimensions of the different styles of sliders (from Aqua document) -#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 doesn't specify the orientation we have to assume he wants a -* horizontal one. Therefore in this file when testing for the slider's orientation -* vertical is tested for if this is not set then we use the horizontal one -* e.g., if (GetWindowStyle() & wxSL_VERTICAL) {} else { horizontal case }. -*/ - +// NB: The default orientation for a slider is horizontal; however, if the user specifies +// some slider styles but doesn't specify the orientation we have to assume he wants a +// horizontal one. Therefore in this file when testing for the slider's orientation +// vertical is tested for if this is not set then we use the horizontal one +// e.g., if (GetWindowStyle() & wxSL_VERTICAL) {} else { horizontal case }. wxSlider::wxSlider() { @@ -51,18 +47,19 @@ wxSlider::wxSlider() m_macValueStatic = NULL; } -bool wxSlider::Create(wxWindow *parent, wxWindowID id, - int value, int minValue, int maxValue, - const wxPoint& pos, - const wxSize& size, long style, - const wxValidator& validator, - const wxString& name) +bool wxSlider::Create(wxWindow *parent, + wxWindowID id, + int value, int minValue, int maxValue, + const wxPoint& pos, + const wxSize& size, long style, + const wxValidator& validator, + const wxString& name) { - m_macIsUserPane = false ; + m_macIsUserPane = false; - m_macMinimumStatic = NULL ; - m_macMaximumStatic = NULL ; - m_macValueStatic = NULL ; + m_macMinimumStatic = NULL; + m_macMaximumStatic = NULL; + m_macValueStatic = NULL; m_lineSize = 1; m_tickFreq = 0; @@ -70,7 +67,7 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id, m_rangeMax = maxValue; m_rangeMin = minValue; - m_pageSize = (int)((maxValue-minValue)/10); + m_pageSize = (int)((maxValue - minValue) / 10); // our styles are redundant: wxSL_LEFT/RIGHT imply wxSL_VERTICAL and // wxSL_TOP/BOTTOM imply wxSL_HORIZONTAL, but for backwards compatibility @@ -98,35 +95,43 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id, } wxASSERT_MSG( !(style & wxSL_VERTICAL) || !(style & wxSL_HORIZONTAL), - _T("incompatible slider direction and orientation") ); + wxT("incompatible slider direction and orientation") ); if ( !wxControl::Create(parent, id, pos, size, style, validator, name) ) return false; - Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ; + Rect bounds = wxMacGetBoundsForControl( this , pos , size ); // NB: (RN) Ticks here are sometimes off in the GUI if there - // is not as many ticks as there are values + // are not as many tick marks as there are values // - UInt16 tickMarks = 0 ; + int tickMarks = 0; if ( style & wxSL_AUTOTICKS ) - tickMarks = (maxValue - minValue) + 1; //+1 for the 0 value + tickMarks = (maxValue - minValue) + 1; // +1 for the 0 value - // keep the number of tickmarks from becoming unwieldly + // keep the number of tickmarks from becoming unwieldly, therefore below it is ok to cast + // it to a UInt16 while (tickMarks > 20) tickMarks /= 5; m_peer = new wxMacControl( this ); - verify_noerr ( CreateSliderControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds , - value , minValue , maxValue , kControlSliderPointsDownOrRight , tickMarks , true /* liveTracking */ , - GetwxMacLiveScrollbarActionProc() , m_peer->GetControlRefAddr() ) ); + OSStatus err = CreateSliderControl( + MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds, + value, minValue, maxValue, + kControlSliderPointsDownOrRight, + (UInt16) tickMarks, true /* liveTracking */, + GetwxMacLiveScrollbarActionProc(), + m_peer->GetControlRefAddr() ); + verify_noerr( err ); if (style & wxSL_VERTICAL) - SetSizeHints(10, -1, 10, -1); // Forces SetSize to use the proper width + // Forces SetSize to use the proper width + SetSizeHints(10, -1, 10, -1); else - SetSizeHints(-1, 10, -1, 10); // Forces SetSize to use the proper height + // Forces SetSize to use the proper height + SetSizeHints(-1, 10, -1, 10); - // NB! SetSizeHints is overloaded by wxSlider and will substitute 10 with the + // 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 @@ -140,7 +145,7 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID id, SetRange(minValue, maxValue); SetValue(value); - MacPostControlCreate(pos,size) ; + MacPostControlCreate(pos, size); return true; } @@ -151,9 +156,9 @@ wxSlider::~wxSlider() // responsible for their disposal, but only if we are not part of a DestroyAllChildren if ( m_parent && !m_parent->IsBeingDeleted() ) { - delete m_macMinimumStatic ; - delete m_macMaximumStatic ; - delete m_macValueStatic ; + delete m_macMinimumStatic; + delete m_macMaximumStatic; + delete m_macValueStatic; } } @@ -168,12 +173,12 @@ void wxSlider::SetValue(int value) if ( m_macValueStatic ) { wxString valuestring; - valuestring.Printf( wxT("%d") , value ); + valuestring.Printf( wxT("%d"), value ); m_macValueStatic->SetLabel( valuestring ); } // We only invert for the setting of the actual native widget - m_peer->SetValue( ValueInvertOrNot ( value ) ) ; + m_peer->SetValue( ValueInvertOrNot( value ) ); } void wxSlider::SetRange(int minValue, int maxValue) @@ -183,26 +188,35 @@ void wxSlider::SetRange(int minValue, int maxValue) m_rangeMin = minValue; m_rangeMax = maxValue; - m_peer->SetMinimum( m_rangeMin); - m_peer->SetMaximum( m_rangeMax); + m_peer->SetMinimum( m_rangeMin ); + m_peer->SetMaximum( m_rangeMax ); if (m_macMinimumStatic) { - value.Printf(wxT("%d"), ValueInvertOrNot( m_rangeMin ) ); - m_macMinimumStatic->SetLabel(value); + value.Printf( wxT("%d"), ValueInvertOrNot( m_rangeMin ) ); + m_macMinimumStatic->SetLabel( value ); } if (m_macMaximumStatic) { - value.Printf(wxT("%d"), ValueInvertOrNot( m_rangeMax ) ); - m_macMaximumStatic->SetLabel(value); + value.Printf( wxT("%d"), ValueInvertOrNot( m_rangeMax ) ); + m_macMaximumStatic->SetLabel( value ); } - SetValue(m_rangeMin); + // If the range is out of bounds, set it to a + // value that is within bounds + // RN: Testing reveals OSX does its own + // bounding, perhaps this isn't needed? + int currentValue = GetValue(); + + if(currentValue < m_rangeMin) + SetValue(m_rangeMin); + else if(currentValue > m_rangeMax) + SetValue(m_rangeMax); } // For trackbars only -void wxSlider::SetTickFreq(int n, int pos) +void wxSlider::SetTickFreq(int n, int WXUNUSED(pos)) { // TODO m_tickFreq = n; @@ -238,7 +252,7 @@ void wxSlider::SetLineSize(int lineSize) int wxSlider::GetLineSize() const { // TODO - return 0; + return m_lineSize; } int wxSlider::GetSelEnd() const @@ -253,12 +267,12 @@ int wxSlider::GetSelStart() const return 0; } -void wxSlider::SetSelection(int minPos, int maxPos) +void wxSlider::SetSelection(int WXUNUSED(minPos), int WXUNUSED(maxPos)) { // TODO } -void wxSlider::SetThumbLength(int len) +void wxSlider::SetThumbLength(int WXUNUSED(len)) { // TODO } @@ -269,57 +283,51 @@ int wxSlider::GetThumbLength() const return 0; } -void wxSlider::SetTick(int tickPos) +void wxSlider::SetTick(int WXUNUSED(tickPos)) { // TODO } -void wxSlider::Command (wxCommandEvent & event) +void wxSlider::Command(wxCommandEvent &event) { SetValue(event.GetInt()); ProcessCommand(event); } -void wxSlider::MacHandleControlClick( WXWidget control , wxInt16 controlpart, bool mouseStillDown ) +void wxSlider::MacHandleControlClick(WXWidget WXUNUSED(control), + wxInt16 WXUNUSED(controlpart), + bool WXUNUSED(mouseStillDown)) { // Whatever the native value is, we may need to invert it for calling // SetValue and putting the possibly inverted value in the event - SInt16 value = ValueInvertOrNot ( m_peer->GetValue() ) ; - - SetValue( value ) ; - - wxEventType scrollEvent = wxEVT_NULL ; + int value = ValueInvertOrNot( m_peer->GetValue() ); - scrollEvent = wxEVT_SCROLL_THUMBTRACK; + SetValue( value ); - wxScrollEvent event(scrollEvent, m_windowId); - event.SetPosition(value); + wxScrollEvent event( wxEVT_SCROLL_THUMBTRACK, m_windowId ); + event.SetPosition( value ); event.SetEventObject( this ); - GetEventHandler()->ProcessEvent(event); + 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 WXUNUSED(handler), + WXEVENTREF WXUNUSED(mevent)) { // Whatever the native value is, we may need to invert it for calling // SetValue and putting the possibly inverted value in the event - SInt16 value = ValueInvertOrNot ( m_peer->GetValue() ) ; + int value = ValueInvertOrNot( m_peer->GetValue() ) ; SetValue( value ) ; - wxEventType scrollEvent = wxEVT_NULL ; - - scrollEvent = wxEVT_SCROLL_THUMBRELEASE; - - wxScrollEvent event(scrollEvent, m_windowId); - event.SetPosition(value); + wxScrollEvent event( wxEVT_SCROLL_THUMBRELEASE, m_windowId ); + event.SetPosition( value ); event.SetEventObject( this ); - GetEventHandler()->ProcessEvent(event); + GetEventHandler()->ProcessEvent( event ); wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, m_windowId ); cevent.SetInt( value ); @@ -334,15 +342,21 @@ wxInt32 wxSlider::MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF mevent ) // for the slider different values would cause redrawing and mouse detection problems // void wxSlider::DoSetSizeHints( int minW, int minH, - int maxW , int maxH , - int incW , int incH ) + int maxW, int maxH, + int WXUNUSED(incW), int WXUNUSED(incH) ) { wxSize size = GetBestSize(); if (GetWindowStyle() & wxSL_VERTICAL) - wxWindow::DoSetSizeHints(size.x, minH, size.x, maxH, incW, incH); + { + SetMinSize( wxSize(size.x,minH) ); + SetMaxSize( wxSize(size.x,maxH) ); + } else - wxWindow::DoSetSizeHints(minW, size.y, maxW, size.y, incW, incH); + { + SetMinSize( wxSize(minW,size.y) ); + SetMaxSize( wxSize(maxW,size.y) ); + } } wxSize wxSlider::DoGetBestSize() const @@ -361,9 +375,9 @@ wxSize wxSlider::DoGetBestSize() const wxString text; // Get maximum text label width and height - text.Printf(wxT("%d"), ValueInvertOrNot( m_rangeMin ) ); + text.Printf( wxT("%d"), ValueInvertOrNot( m_rangeMin ) ); GetTextExtent(text, &mintwidth, &mintheight); - text.Printf(wxT("%d"), ValueInvertOrNot( m_rangeMax ) ); + text.Printf( wxT("%d"), ValueInvertOrNot( m_rangeMax ) ); GetTextExtent(text, &maxtwidth, &maxtheight); if (maxtheight > mintheight) @@ -379,6 +393,8 @@ wxSize wxSlider::DoGetBestSize() const if (GetWindowStyle() & wxSL_VERTICAL) { + size.y = 150; + if (GetWindowStyle() & wxSL_AUTOTICKS) size.x = wxSLIDER_DIMENSIONACROSS_WITHTICKMARKS; else @@ -386,18 +402,16 @@ wxSize wxSlider::DoGetBestSize() const if (GetWindowStyle() & wxSL_LABELS) size.x += textwidth + wxSLIDER_BORDERTEXT; - - size.y = 150; } else { + size.x = 150; + if (GetWindowStyle() & wxSL_AUTOTICKS) size.y = wxSLIDER_DIMENSIONACROSS_WITHTICKMARKS; else size.y = wxSLIDER_DIMENSIONACROSS_ARROW; - size.x = 150; - if (GetWindowStyle() & wxSL_LABELS) { size.y += textheight + wxSLIDER_BORDERTEXT; @@ -410,13 +424,11 @@ wxSize wxSlider::DoGetBestSize() const void wxSlider::DoSetSize(int x, int y, int w, int h, int sizeFlags) { - int xborder, yborder; + int yborder = 0; int minValWidth, maxValWidth, textheight; int sliderBreadth; int width = w; - xborder = yborder = 0; - if (GetWindowStyle() & wxSL_LABELS) { wxString text; @@ -448,7 +460,7 @@ void wxSlider::DoSetSize(int x, int y, int w, int h, int sizeFlags) // 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 ); + wxControl::DoSetSize( x, y, w, h, sizeFlags ); if (GetWindowStyle() & wxSL_VERTICAL) // If vertical, use current value