X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9467bdb7f5bfde9f99331097daacb93564ca122e..9869c26285dc51d13607cddaa04f65ce983653a5:/include/wx/univ/slider.h diff --git a/include/wx/univ/slider.h b/include/wx/univ/slider.h index acb54538b6..fadab4d12f 100644 --- a/include/wx/univ/slider.h +++ b/include/wx/univ/slider.h @@ -4,7 +4,6 @@ // Author: Vadim Zeitlin // Modified by: // Created: 09.02.01 -// RCS-ID: $Id$ // Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com) // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -20,23 +19,23 @@ // our actions are the same as scrollbars -#define wxACTION_SLIDER_START _T("start") // to the beginning -#define wxACTION_SLIDER_END _T("end") // to the end -#define wxACTION_SLIDER_LINE_UP _T("lineup") // one line up/left -#define wxACTION_SLIDER_PAGE_UP _T("pageup") // one page up/left -#define wxACTION_SLIDER_LINE_DOWN _T("linedown") // one line down/right -#define wxACTION_SLIDER_PAGE_DOWN _T("pagedown") // one page down/right -#define wxACTION_SLIDER_PAGE_CHANGE _T("pagechange")// change page by numArg +#define wxACTION_SLIDER_START wxT("start") // to the beginning +#define wxACTION_SLIDER_END wxT("end") // to the end +#define wxACTION_SLIDER_LINE_UP wxT("lineup") // one line up/left +#define wxACTION_SLIDER_PAGE_UP wxT("pageup") // one page up/left +#define wxACTION_SLIDER_LINE_DOWN wxT("linedown") // one line down/right +#define wxACTION_SLIDER_PAGE_DOWN wxT("pagedown") // one page down/right +#define wxACTION_SLIDER_PAGE_CHANGE wxT("pagechange")// change page by numArg -#define wxACTION_SLIDER_THUMB_DRAG _T("thumbdrag") -#define wxACTION_SLIDER_THUMB_MOVE _T("thumbmove") -#define wxACTION_SLIDER_THUMB_RELEASE _T("thumbrelease") +#define wxACTION_SLIDER_THUMB_DRAG wxT("thumbdrag") +#define wxACTION_SLIDER_THUMB_MOVE wxT("thumbmove") +#define wxACTION_SLIDER_THUMB_RELEASE wxT("thumbrelease") // ---------------------------------------------------------------------------- // wxSlider // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxSlider : public wxSliderBase, +class WXDLLIMPEXP_CORE wxSlider : public wxSliderBase, public wxControlWithThumb { public: @@ -77,7 +76,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 +135,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);