X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1be7a35c5ec31b6cfcab9d969c7969586441a945..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/include/wx/slider.h diff --git a/include/wx/slider.h b/include/wx/slider.h index a3c114f064..14aca4445b 100644 --- a/include/wx/slider.h +++ b/include/wx/slider.h @@ -40,11 +40,12 @@ #define wxSL_SELRANGE 0x0800 #define wxSL_INVERSE 0x1000 -// obsolete -#define wxSL_NOTIFY_DRAG 0x0000 +#if WXWIN_COMPATIBILITY_2_6 + // obsolete + #define wxSL_NOTIFY_DRAG 0x0000 +#endif // WXWIN_COMPATIBILITY_2_6 - -extern WXDLLEXPORT_DATA(const wxChar) wxSliderNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxSliderNameStr[]; // ---------------------------------------------------------------------------- // wxSliderBase: define wxSlider interface @@ -104,6 +105,9 @@ public: protected: + // choose the default border for this window + virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } + // adjust value according to wxSL_INVERSE style virtual int ValueInvertOrNot(int value) const { @@ -125,9 +129,6 @@ private: #include "wx/univ/slider.h" #elif defined(__WXMSW__) #include "wx/msw/slider95.h" - #if WXWIN_COMPATIBILITY_2_4 - #define wxSlider95 wxSlider - #endif #elif defined(__WXMOTIF__) #include "wx/motif/slider.h" #elif defined(__WXGTK20__)