update minimum GTK2 version requirement to 2.6

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

diff --git a/interface/wx/slider.h b/interface/wx/slider.h
index 443ffe5e67f48a81bce4591384b611944d8cd146..36554a629da5fcdbe5db417616d17c9bc5e9ae6a 100644 (file)
--- a/interface/wx/slider.h
+++ b/interface/wx/slider.h
@@ -6,6 +6,23 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

+
+#define wxSL_HORIZONTAL      wxHORIZONTAL /* 0x0004 */
+#define wxSL_VERTICAL        wxVERTICAL   /* 0x0008 */
+
+#define wxSL_TICKS           0x0010
+#define wxSL_AUTOTICKS       wxSL_TICKS // we don't support manual ticks
+#define wxSL_LEFT            0x0040
+#define wxSL_TOP             0x0080
+#define wxSL_RIGHT           0x0100
+#define wxSL_BOTTOM          0x0200
+#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)
+

 /**
     @class wxSlider
 
 /**
     @class wxSlider
 


@@ -41,7 +58,7 @@
     @style{wxSL_SELRANGE}
            Allows the user to select a range on the slider. Windows only.
     @style{wxSL_INVERSE}
     @style{wxSL_SELRANGE}
            Allows the user to select a range on the slider. Windows only.
     @style{wxSL_INVERSE}

-           Inverses the mininum and maximum endpoints on the slider. Not
+           Inverses the minimum and maximum endpoints on the slider. Not

            compatible with wxSL_SELRANGE.
     @endStyleTable
 
            compatible with wxSL_SELRANGE.
     @endStyleTable
 


@@ -99,6 +116,9 @@
         Process @c wxEVT_SCROLL_THUMBRELEASE thumb release events.
     @event{EVT_COMMAND_SCROLL_CHANGED(func)}
         Process @c wxEVT_SCROLL_CHANGED end of scrolling events (MSW only).
         Process @c wxEVT_SCROLL_THUMBRELEASE thumb release events.
     @event{EVT_COMMAND_SCROLL_CHANGED(func)}
         Process @c wxEVT_SCROLL_CHANGED end of scrolling events (MSW only).

+    @event{EVT_SLIDER(id, func)}
+        Process @c wxEVT_COMMAND_SLIDER_UPDATED which is generated after any
+        change of wxSlider position in addition to one of the events above.

     @endEventTable
 
     @section slider_diff The difference between EVT_SCROLL_THUMBRELEASE and EVT_SCROLL_CHANGED
     @endEventTable
 
     @section slider_diff The difference between EVT_SCROLL_THUMBRELEASE and EVT_SCROLL_CHANGED


@@ -337,14 +357,12 @@ public:
         @param n
             Frequency. For example, if the frequency is set to two, a tick mark is
             displayed for every other increment in the slider's range.
         @param n
             Frequency. For example, if the frequency is set to two, a tick mark is
             displayed for every other increment in the slider's range.

-        @param pos
-            Position. Must be greater than zero. @todo: what is this for?

 
         @onlyfor{wxmsw}
 
         @see GetTickFreq()
     */
 
         @onlyfor{wxmsw}
 
         @see GetTickFreq()
     */

-    virtual void SetTickFreq(int n, int pos);
+    virtual void SetTickFreq(int n);

 
     /**
         Sets the slider position.
 
     /**
         Sets the slider position.