don't define, nor use, LVS_EX_LABELTIP under WinCE

[wxWidgets.git] / include / wx / slider.h

diff --git a/include/wx/slider.h b/include/wx/slider.h
index 6c31343bd7317aada4504da9fcc6e7d65f06ffcd..14aca4445b102050a1a30e140d9021118d0f8dc6 100644 (file)
--- a/include/wx/slider.h
+++ b/include/wx/slider.h
@@ -45,7 +45,7 @@
     #define wxSL_NOTIFY_DRAG     0x0000
 #endif // WXWIN_COMPATIBILITY_2_6
 
     #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
 
 // ----------------------------------------------------------------------------
 // wxSliderBase: define wxSlider interface


@@ -105,6 +105,9 @@ public:
 
 protected:
 
 
 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
     {
     // adjust value according to wxSL_INVERSE style
     virtual int ValueInvertOrNot(int value) const
     {


@@ -126,9 +129,6 @@ private:
     #include "wx/univ/slider.h"
 #elif defined(__WXMSW__)
     #include "wx/msw/slider95.h"
     #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__)
 #elif defined(__WXMOTIF__)
     #include "wx/motif/slider.h"
 #elif defined(__WXGTK20__)