guarding agains NULL

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

diff --git a/include/wx/slider.h b/include/wx/slider.h
index 05e71cead508b154d835bd6c24b69daf4c3f5567..df79d338e5aeee39c50939d937994b9d1f95214a 100644 (file)
--- a/include/wx/slider.h
+++ b/include/wx/slider.h
@@ -40,7 +40,7 @@
 #define wxSL_INVERSE         0x1000
 #define wxSL_MIN_MAX_LABELS  0x2000
 #define wxSL_VALUE_LABEL     0x4000
 #define wxSL_INVERSE         0x1000
 #define wxSL_MIN_MAX_LABELS  0x2000
 #define wxSL_VALUE_LABEL     0x4000

-#define wxSL_LABELS          wxSL_MIN_MAX_LABELS|wxSL_VALUE_LABEL
+#define wxSL_LABELS          (wxSL_MIN_MAX_LABELS|wxSL_VALUE_LABEL)

 
 #if WXWIN_COMPATIBILITY_2_6
     // obsolete
 
 #if WXWIN_COMPATIBILITY_2_6
     // obsolete


@@ -95,7 +95,7 @@ public:
     // warning: most of subsequent methods are currently only implemented in
     //          wxMSW under Win95 and are silently ignored on other platforms
 
     // warning: most of subsequent methods are currently only implemented in
     //          wxMSW under Win95 and are silently ignored on other platforms
 

-    virtual void SetTickFreq(int WXUNUSED(n), int WXUNUSED(pos)) { }
+    void SetTickFreq(int freq) { DoSetTickFreq(freq); }

     virtual int GetTickFreq() const { return 0; }
     virtual void ClearTicks() { }
     virtual void SetTick(int WXUNUSED(tickPos)) { }
     virtual int GetTickFreq() const { return 0; }
     virtual void ClearTicks() { }
     virtual void SetTick(int WXUNUSED(tickPos)) { }


@@ -105,7 +105,13 @@ public:
     virtual int GetSelStart() const { return GetMax(); }
     virtual void SetSelection(int WXUNUSED(min), int WXUNUSED(max)) { }
 
     virtual int GetSelStart() const { return GetMax(); }
     virtual void SetSelection(int WXUNUSED(min), int WXUNUSED(max)) { }
 

+#if WXWIN_COMPATIBILITY_2_8
+    wxDEPRECATED_INLINE( void SetTickFreq(int freq, int), DoSetTickFreq(freq); )
+#endif
+

 protected:
 protected:

+    // Platform-specific implementation of SetTickFreq
+    virtual void DoSetTickFreq(int WXUNUSED(freq)) { /* unsupported by default */ }

 
     // choose the default border for this window
     virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
 
     // choose the default border for this window
     virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }


@@ -143,8 +149,6 @@ private:
     #include "wx/cocoa/slider.h"
 #elif defined(__WXPM__)
     #include "wx/os2/slider.h"
     #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
 #endif
 
 #endif // wxUSE_SLIDER