From 0a12e013f55022e684508316ad0079511e3b4fe7 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 5 Feb 2011 16:36:30 +0000 Subject: [PATCH] Deprecate second parameter of wxSlider::SetTickFreq(). This parameter was never needed nor properly documented. Simply remove it from SetTickFreq() and keep the overload still taking it for backwards compatibility only. Closes #12907. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66844 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/changes.txt | 4 +++- include/wx/cocoa/slider.h | 6 ++++-- include/wx/msw/slider.h | 4 +++- include/wx/os2/slider.h | 7 ++++--- include/wx/osx/slider.h | 4 +++- include/wx/palmos/slider.h | 3 ++- include/wx/slider.h | 8 +++++++- include/wx/univ/slider.h | 4 +++- interface/wx/slider.h | 4 +--- samples/controls/controls.cpp | 2 +- samples/widgets/slider.cpp | 2 +- src/cocoa/slider.mm | 5 ++--- src/msw/slider.cpp | 4 ++-- src/os2/slider.cpp | 2 +- src/osx/slider_osx.cpp | 2 +- src/palmos/slider.cpp | 2 +- src/univ/slider.cpp | 2 +- src/xrc/xh_slidr.cpp | 2 +- 18 files changed, 41 insertions(+), 26 deletions(-) diff --git a/docs/changes.txt b/docs/changes.txt index 1605e451e8..905066a051 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -377,7 +377,9 @@ Deprecated methods and their replacements with more expected semantics. - wxPORTRAIT and wxLANDSCAPE are now elements of wxPrintOrientation enum and wxPrintData::SetOrientation(int) takes wxPrintOrientation and not int. - +- Second parameter of wxSlider::SetTickFreq(int n, int pos) is deprecated, + simply remove it from your code and use wxSlider::SetTickFreq(int n) as it + was never used anyhow. Major new features in this release ---------------------------------- diff --git a/include/wx/cocoa/slider.h b/include/wx/cocoa/slider.h index 0b5e20df70..46a4ef7c40 100644 --- a/include/wx/cocoa/slider.h +++ b/include/wx/cocoa/slider.h @@ -94,12 +94,14 @@ public: virtual int GetThumbLength() const; // copied from (wxSliderCocoa.h) - virtual void SetTickFreq(int n, int pos); virtual int GetTickFreq() const; - virtual void ClearTicks() { SetTickFreq(0, 0); } + virtual void ClearTicks() { SetTickFreq(0); } virtual void SetTickPos(int pos); +protected: + // Platform-specific implementation of SetTickFreq + virtual void DoSetTickFreq(int freq); }; #endif diff --git a/include/wx/msw/slider.h b/include/wx/msw/slider.h index e84a0e146a..abd4ec4985 100644 --- a/include/wx/msw/slider.h +++ b/include/wx/msw/slider.h @@ -59,7 +59,6 @@ public: int GetMax() const { return m_rangeMax; } // Win32-specific slider methods - void SetTickFreq(int n, int pos); int GetTickFreq() const { return m_tickFreq; } void SetPageSize(int pageSize); int GetPageSize() const; @@ -131,6 +130,9 @@ protected: // of dragging the thumb or scrolling the mouse wheel bool m_isDragging; + // Platform-specific implementation of SetTickFreq + virtual void DoSetTickFreq(int freq); + DECLARE_DYNAMIC_CLASS_NO_COPY(wxSlider) }; diff --git a/include/wx/os2/slider.h b/include/wx/os2/slider.h index 9fc369c7e5..92b7131037 100644 --- a/include/wx/os2/slider.h +++ b/include/wx/os2/slider.h @@ -94,9 +94,6 @@ public: ); void SetThumbLength(int nLen) ; void SetTick(int ntickPos) ; - void SetTickFreq( int n - ,int nPos - ); // // IMPLEMENTATION @@ -148,6 +145,10 @@ protected: ,int nHeight ,int nSizeFlags = wxSIZE_AUTO ); + + // Platform-specific implementation of SetTickFreq + virtual void DoSetTickFreq(int freq); + private: DECLARE_DYNAMIC_CLASS(wxSlider) }; // end of CLASS wxSlider diff --git a/include/wx/osx/slider.h b/include/wx/osx/slider.h index 535d61c22e..851a8eabeb 100644 --- a/include/wx/osx/slider.h +++ b/include/wx/osx/slider.h @@ -59,7 +59,6 @@ public: void SetMax(int maxValue) { SetRange(m_rangeMin, maxValue); } // For trackbars only - void SetTickFreq(int n, int pos); inline int GetTickFreq() const { return m_tickFreq; } void SetPageSize(int pageSize); int GetPageSize() const ; @@ -81,6 +80,9 @@ public: virtual void TriggerScrollEvent( wxEventType scrollEvent ) ; protected: + // Platform-specific implementation of SetTickFreq + virtual void DoSetTickFreq(int freq); + virtual wxSize DoGetBestSize() const; virtual void DoSetSize(int x, int y, int w, int h, int sizeFlags); virtual void DoMoveWindow(int x, int y, int w, int h); diff --git a/include/wx/palmos/slider.h b/include/wx/palmos/slider.h index 078d5d23ec..5c978c1b9c 100644 --- a/include/wx/palmos/slider.h +++ b/include/wx/palmos/slider.h @@ -52,7 +52,6 @@ public: int GetMax() const; // For trackbars only - void SetTickFreq(int n, int pos); int GetTickFreq() const; void SetPageSize(int pageSize); int GetPageSize() const; @@ -75,6 +74,8 @@ public: bool SendScrollEvent(WXEVENTPTR event); protected: + // Platform-specific implementation of SetTickFreq + virtual void DoSetTickFreq(int freq); virtual wxSize DoGetBestSize() const; diff --git a/include/wx/slider.h b/include/wx/slider.h index 84896602f9..2bb796236e 100644 --- a/include/wx/slider.h +++ b/include/wx/slider.h @@ -95,7 +95,7 @@ public: // warning: most of subsequent methods are currently only implemented in // wxMSW under Win95 and are silently ignored on other platforms - virtual void SetTickFreq(int WXUNUSED(n), int WXUNUSED(pos)) { } + void SetTickFreq(int freq) { DoSetTickFreq(freq); } virtual int GetTickFreq() const { return 0; } virtual void ClearTicks() { } virtual void SetTick(int WXUNUSED(tickPos)) { } @@ -105,7 +105,13 @@ public: virtual int GetSelStart() const { return GetMax(); } virtual void SetSelection(int WXUNUSED(min), int WXUNUSED(max)) { } +#ifdef WXWIN_COMPATIBILITY_2_8 + wxDEPRECATED_INLINE( void SetTickFreq(int freq, int), DoSetTickFreq(freq); ) +#endif + protected: + // Platform-specific implementation of SetTickFreq + virtual void DoSetTickFreq(int WXUNUSED(freq)) { /* unsupported by default */ } // choose the default border for this window virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } diff --git a/include/wx/univ/slider.h b/include/wx/univ/slider.h index 3ffb5dd6fd..6f6ae3a2aa 100644 --- a/include/wx/univ/slider.h +++ b/include/wx/univ/slider.h @@ -77,7 +77,6 @@ public: virtual void SetThumbLength(int lenPixels); virtual int GetThumbLength() const; - virtual void SetTickFreq(int n, int WXUNUSED(dummy) = 0); virtual int GetTickFreq() const { return m_tickFreq; } // wxUniv-specific methods @@ -137,6 +136,9 @@ protected: INVALID_THUMB_VALUE = -0xffff }; + // Platform-specific implementation of SetTickFreq + virtual void DoSetTickFreq(int freq); + // overridden base class virtuals virtual wxSize DoGetBestClientSize() const; virtual void DoDraw(wxControlRenderer *renderer); diff --git a/interface/wx/slider.h b/interface/wx/slider.h index 443ffe5e67..bd7ae93f00 100644 --- a/interface/wx/slider.h +++ b/interface/wx/slider.h @@ -337,14 +337,12 @@ public: @param n Frequency. For example, if the frequency is set to two, a tick mark is displayed for every other increment in the slider's range. - @param pos - Position. Must be greater than zero. @todo: what is this for? @onlyfor{wxmsw} @see GetTickFreq() */ - virtual void SetTickFreq(int n, int pos); + virtual void SetTickFreq(int n); /** Sets the slider position. diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp index e95eda9e44..79e9eebecf 100644 --- a/samples/controls/controls.cpp +++ b/samples/controls/controls.cpp @@ -855,7 +855,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h ) m_slider = new wxSlider( panel, ID_SLIDER, 0, 0, 200, wxDefaultPosition, wxSize(155,wxDefaultCoord), wxSL_AUTOTICKS | wxSL_LABELS); - m_slider->SetTickFreq(40, 0); + m_slider->SetTickFreq(40); sz->Add( m_slider, 0, wxALL, 10 ); m_gaugeVert = new wxGauge( panel, wxID_ANY, 100, diff --git a/samples/widgets/slider.cpp b/samples/widgets/slider.cpp index 26002e1431..c4f5135444 100644 --- a/samples/widgets/slider.cpp +++ b/samples/widgets/slider.cpp @@ -531,7 +531,7 @@ void SliderWidgetsPage::DoSetTickFreq() return; } - m_slider->SetTickFreq(freq, 0 /* unused */); + m_slider->SetTickFreq(freq); } void SliderWidgetsPage::DoSetThumbLen() diff --git a/src/cocoa/slider.mm b/src/cocoa/slider.mm index 9610fc44bb..5ab19e01ef 100644 --- a/src/cocoa/slider.mm +++ b/src/cocoa/slider.mm @@ -87,8 +87,7 @@ bool wxSlider::Create(wxWindow *parent, wxWindowID winid, // minValue > maxValue not handled, tickMarks set to 0 if ( style & wxSL_AUTOTICKS ) tickMarks = ((maxValue - minValue >= 0) ? (maxValue - minValue) : 0); - // arg2 needed a value, doesnt do anything - SetTickFreq(tickMarks,1); + SetTickFreq(tickMarks); return true; } @@ -206,7 +205,7 @@ int wxSlider::GetMax() const return [GetNSSlider() maxValue]; } -void wxSlider::SetTickFreq(int n, int pos) +void wxSlider::DoSetTickFreq(int n) { const int numTicks = (n > 0) ? ((GetMax() - GetMin()) / n) + 1 : 0; [GetNSSlider() setNumberOfTickMarks:numTicks]; diff --git a/src/msw/slider.cpp b/src/msw/slider.cpp index 3eb922c534..b65a2814f5 100644 --- a/src/msw/slider.cpp +++ b/src/msw/slider.cpp @@ -666,10 +666,10 @@ void wxSlider::SetRange(int minValue, int maxValue) } } -void wxSlider::SetTickFreq(int n, int pos) +void wxSlider::DoSetTickFreq(int n) { m_tickFreq = n; - ::SendMessage( GetHwnd(), TBM_SETTICFREQ, (WPARAM) n, (LPARAM) pos ); + ::SendMessage( GetHwnd(), TBM_SETTICFREQ, (WPARAM) n, (LPARAM) 0 ); } void wxSlider::SetPageSize(int pageSize) diff --git a/src/os2/slider.cpp b/src/os2/slider.cpp index 83752dd30b..c55d438bb2 100644 --- a/src/os2/slider.cpp +++ b/src/os2/slider.cpp @@ -1074,7 +1074,7 @@ void wxSlider::SetTick( } // end of wxSlider::SetTick // For trackbars only -void wxSlider::SetTickFreq( int n, int WXUNUSED(nPos) ) +void wxSlider::DoSetTickFreq( int n ) { SLDCDATA vSlData; WNDPARAMS vWndParams; diff --git a/src/osx/slider_osx.cpp b/src/osx/slider_osx.cpp index de069f1e4a..ef3a7f1b7d 100644 --- a/src/osx/slider_osx.cpp +++ b/src/osx/slider_osx.cpp @@ -206,7 +206,7 @@ void wxSlider::SetRange(int minValue, int maxValue) } // For trackbars only -void wxSlider::SetTickFreq(int n, int WXUNUSED(pos)) +void wxSlider::DoSetTickFreq(int n) { // TODO m_tickFreq = n; diff --git a/src/palmos/slider.cpp b/src/palmos/slider.cpp index 9db9fa3679..53f08eeaaa 100644 --- a/src/palmos/slider.cpp +++ b/src/palmos/slider.cpp @@ -168,7 +168,7 @@ void wxSlider::SetRange(int WXUNUSED(minValue), int WXUNUSED(maxValue)) // unsupported feature } -void wxSlider::SetTickFreq(int WXUNUSED(n), int WXUNUSED(pos)) +void wxSlider::DoSetTickFreq(int WXUNUSED(n)) { // unsupported feature } diff --git a/src/univ/slider.cpp b/src/univ/slider.cpp index 431707a095..dde7764218 100644 --- a/src/univ/slider.cpp +++ b/src/univ/slider.cpp @@ -352,7 +352,7 @@ int wxSlider::GetThumbLength() const // wxSlider ticks // ---------------------------------------------------------------------------- -void wxSlider::SetTickFreq(int n, int WXUNUSED(dummy)) +void wxSlider::DoSetTickFreq(int n) { wxCHECK_RET (n > 0, wxT("invalid slider tick frequency")); diff --git a/src/xrc/xh_slidr.cpp b/src/xrc/xh_slidr.cpp index 9f6e07cf31..b888d71de9 100644 --- a/src/xrc/xh_slidr.cpp +++ b/src/xrc/xh_slidr.cpp @@ -63,7 +63,7 @@ wxObject *wxSliderXmlHandler::DoCreateResource() if( HasParam(wxT("tickfreq"))) { - control->SetTickFreq(GetLong(wxT("tickfreq")), 0); + control->SetTickFreq(GetLong(wxT("tickfreq"))); } if( HasParam(wxT("pagesize"))) { -- 2.45.2