avoiding crash for pure modifier events

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

diff --git a/include/wx/slider.h b/include/wx/slider.h
index a3c114f06431715a46610b96aa5ec021ee5832f1..7a92223486d1a6445204fa7159fdca37039c448b 100644 (file)
--- a/include/wx/slider.h
+++ b/include/wx/slider.h
@@ -40,17 +40,18 @@
 #define wxSL_SELRANGE        0x0800
 #define wxSL_INVERSE         0x1000
 
 #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 WXDLLIMPEXP_DATA_CORE(const char) wxSliderNameStr[];

 
 // ----------------------------------------------------------------------------
 // wxSliderBase: define wxSlider interface
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxSliderBase: define wxSlider interface
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxSliderBase : public wxControl
+class WXDLLIMPEXP_CORE wxSliderBase : public wxControl

 {
 public:
     /* the ctor of the derived class should have the following form:
 {
 public:
     /* the ctor of the derived class should have the following form:


@@ -104,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
     {


@@ -124,10 +128,7 @@ private:
 #if defined(__WXUNIVERSAL__)
     #include "wx/univ/slider.h"
 #elif defined(__WXMSW__)
 #if defined(__WXUNIVERSAL__)
     #include "wx/univ/slider.h"
 #elif defined(__WXMSW__)

-    #include "wx/msw/slider95.h"
-    #if WXWIN_COMPATIBILITY_2_4
-         #define wxSlider95 wxSlider
-    #endif
+    #include "wx/msw/slider.h"

 #elif defined(__WXMOTIF__)
     #include "wx/motif/slider.h"
 #elif defined(__WXGTK20__)
 #elif defined(__WXMOTIF__)
     #include "wx/motif/slider.h"
 #elif defined(__WXGTK20__)


@@ -135,7 +136,7 @@ private:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/slider.h"
 #elif defined(__WXMAC__)
 #elif defined(__WXGTK__)
     #include "wx/gtk1/slider.h"
 #elif defined(__WXMAC__)

-    #include "wx/mac/slider.h"
+    #include "wx/osx/slider.h"

 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/slider.h"
 #elif defined(__WXPM__)
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/slider.h"
 #elif defined(__WXPM__)