X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/86745a19d0461dfb74cdc01986f6c23991460fc2..c534e69669840e016d9e109356d8839302bb95db:/include/wx/slider.h diff --git a/include/wx/slider.h b/include/wx/slider.h index 632fc5b414..3d775be237 100644 --- a/include/wx/slider.h +++ b/include/wx/slider.h @@ -5,7 +5,7 @@ // Modified by: // Created: 09.02.01 // RCS-ID: $Id$ -// Copyright: (c) 1996-2001 wxWidgets team +// Copyright: (c) 1996-2001 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -32,19 +32,20 @@ #define wxSL_TICKS 0x0010 #define wxSL_AUTOTICKS wxSL_TICKS // we don't support manual ticks #define wxSL_LABELS 0x0020 +#define wxSL_LEFT 0x0040 #define wxSL_TOP 0x0080 -#define wxSL_LEFT (wxSL_TOP | wxVERTICAL) +#define wxSL_RIGHT 0x0100 #define wxSL_BOTTOM 0x0200 -#define wxSL_RIGHT (wxSL_BOTTOM | wxVERTICAL) #define wxSL_BOTH 0x0400 #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 wxChar) wxSliderNameStr[]; // ---------------------------------------------------------------------------- // wxSliderBase: define wxSlider interface @@ -125,13 +126,12 @@ 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(__WXGTK__) +#elif defined(__WXGTK20__) #include "wx/gtk/slider.h" +#elif defined(__WXGTK__) + #include "wx/gtk1/slider.h" #elif defined(__WXMAC__) #include "wx/mac/slider.h" #elif defined(__WXCOCOA__)