Minor corrections to wxSL_LABELS definition and documentation.

Use parentheses around the macro expansion to ensure that code like "whatever
& ~wxSL_LABELS" still works as expected.

Be more explicit in wxSL_LABELS description and mark wxSL_MIN_MAX_LABELS and
wxSL_VALUE_LABEL as being new in 2.9.1.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62652 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/slider.h b/include/wx/slider.h
index 05e71cead508b154d835bd6c24b69daf4c3f5567..84896602f958b72dfd48608d28107056c43167ad 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_LABELS          wxSL_MIN_MAX_LABELS|wxSL_VALUE_LABEL
+#define wxSL_LABELS          (wxSL_MIN_MAX_LABELS|wxSL_VALUE_LABEL)
 
 #if WXWIN_COMPATIBILITY_2_6
     // obsolete

diff --git a/interface/wx/slider.h b/interface/wx/slider.h
index d1fd50460e366c1c0f0ce9120887ee7dc8bfbc75..f45c5918044b7790766aebed4c5f2f9442148806 100644 (file)
--- a/interface/wx/slider.h
+++ b/interface/wx/slider.h
@@ -24,11 +24,12 @@
     @style{wxSL_AUTOTICKS}
            Displays tick marks. Windows only.
     @style{wxSL_MIN_MAX_LABELS}
-           Displays minimum, maximum labels.
+           Displays minimum, maximum labels (new since wxWidgets 2.9.1).
     @style{wxSL_VALUE_LABEL}
-           Displays value label.
+           Displays value label (new since wxWidgets 2.9.1).
     @style{wxSL_LABELS}
-           Displays minimum, maximum and value labels (same as the two above together).
+           Displays minimum, maximum and value labels (same as wxSL_VALUE_LABEL
+           and wxSL_MIN_MAX_LABELS together).
     @style{wxSL_LEFT}
            Displays ticks on the left and forces the slider to be vertical.
     @style{wxSL_RIGHT}