X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..32c19f25fce3a38f9e4cf1497761fd7364d7bc62:/include/wx/slider.h diff --git a/include/wx/slider.h b/include/wx/slider.h index 1ed1aa749f..dbd0a2a958 100644 --- a/include/wx/slider.h +++ b/include/wx/slider.h @@ -22,7 +22,7 @@ #include "wx/control.h" -WXDLLEXPORT_DATA(extern const wxChar*) wxSliderNameStr; +extern WXDLLEXPORT_DATA(const wxChar*) wxSliderNameStr; // ---------------------------------------------------------------------------- // wxSliderBase: define wxSlider interface @@ -80,10 +80,19 @@ public: virtual int GetSelStart() const { return GetMax(); } virtual void SetSelection(int WXUNUSED(min), int WXUNUSED(max)) { } - virtual void ApplyParentThemeBackground(const wxColour& bg) { SetBackgroundColour(bg); } +protected: + + // adjust value according to wxSL_INVERSE style + virtual int ValueInvertOrNot(int value) const + { + if (HasFlag(wxSL_INVERSE)) + return (GetMax() + GetMin()) - value; + else + return value; + } private: DECLARE_NO_COPY_CLASS(wxSliderBase) @@ -97,7 +106,9 @@ private: #include "wx/univ/slider.h" #elif defined(__WXMSW__) #include "wx/msw/slider95.h" - #define wxSlider wxSlider95 + #if WXWIN_COMPATIBILITY_2_4 + #define wxSlider95 wxSlider + #endif #elif defined(__WXMOTIF__) #include "wx/motif/slider.h" #elif defined(__WXGTK__) @@ -108,6 +119,8 @@ private: #include "wx/cocoa/slider.h" #elif defined(__WXPM__) #include "wx/os2/slider.h" +#elif defined(__WXPALMOS__) + #include "wx/palmos/slider.h" #endif #endif // wxUSE_SLIDER