Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/slider.h b/include/wx/slider.h
index eeb04a138a0d368802e2bd24c9b7db6449c21eaa..e3ab597b0cf5fbe795a354a48f0034644bac8964 100644 (file)
--- a/include/wx/slider.h
+++ b/include/wx/slider.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     09.02.01
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     09.02.01

-// RCS-ID:      $Id$

 // Copyright:   (c) 1996-2001 Vadim Zeitlin
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1996-2001 Vadim Zeitlin
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -31,7 +30,6 @@
 
 #define wxSL_TICKS           0x0010
 #define wxSL_AUTOTICKS       wxSL_TICKS // we don't support manual ticks
 
 #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_RIGHT           0x0100
 #define wxSL_LEFT            0x0040
 #define wxSL_TOP             0x0080
 #define wxSL_RIGHT           0x0100


@@ -39,6 +37,9 @@
 #define wxSL_BOTH            0x0400
 #define wxSL_SELRANGE        0x0800
 #define wxSL_INVERSE         0x1000
 #define wxSL_BOTH            0x0400
 #define wxSL_SELRANGE        0x0800
 #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)

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


@@ -93,7 +94,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)) { }


@@ -103,7 +104,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; }


@@ -141,8 +148,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