moved wxSL_XXX styles to wx/slider.h; made wxSL_LEFT/RIGHT == wxSL_TOP/BOTTOM | wxSL_...

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 0c9d550056527a5ec9d51bd38c3b1777f9348ce7..ed731d5ff0477f23ae402bfe1ea0fcab85254a4f 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -1151,10 +1151,11 @@ enum wxGeometryCentre
 
 enum wxOrientation
 {
 
 enum wxOrientation
 {

+    // don't change the values of th4ese elements, they are used elsewhere

     wxHORIZONTAL              = 0x0004,
     wxVERTICAL                = 0x0008,
 
     wxHORIZONTAL              = 0x0004,
     wxVERTICAL                = 0x0008,
 

-    wxBOTH                    = (wxVERTICAL | wxHORIZONTAL)
+    wxBOTH                    = wxVERTICAL | wxHORIZONTAL

 };
 
 enum wxDirection
 };
 
 enum wxDirection


@@ -1443,24 +1444,6 @@ enum wxBorder
 #define wxRB_SINGLE         0x0008
 #define wxRB_USE_CHECKBOX   0x0010 /* alternative native control (wxPalmOS) */
 
 #define wxRB_SINGLE         0x0008
 #define wxRB_USE_CHECKBOX   0x0010 /* alternative native control (wxPalmOS) */
 

-/*
- * wxSlider flags
- */
-#define wxSL_HORIZONTAL      wxHORIZONTAL /*  4 */
-#define wxSL_VERTICAL        wxVERTICAL   /*  8 */
-/*  The next one is obsolete - use scroll events instead */
-#define wxSL_NOTIFY_DRAG     0x0000
-#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_BOTTOM          0x0200
-#define wxSL_BOTH            0x0400
-#define wxSL_SELRANGE        0x0800
-#define wxSL_INVERSE         0x1000
-

 /*
  * wxScrollBar flags
  */
 /*
  * wxScrollBar flags
  */

diff --git a/include/wx/slider.h b/include/wx/slider.h
index 20e2b75dcdfd22769022c37acac217aaf20c6178..632fc5b414d4efc403f12b8941e751bc32e50976 100644 (file)
--- a/include/wx/slider.h
+++ b/include/wx/slider.h
@@ -22,6 +22,28 @@
 
 #include "wx/control.h"
 
 
 #include "wx/control.h"
 

+// ----------------------------------------------------------------------------
+// wxSlider flags
+// ----------------------------------------------------------------------------
+
+#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_LABELS          0x0020
+#define wxSL_TOP             0x0080
+#define wxSL_LEFT            (wxSL_TOP | wxVERTICAL)
+#define wxSL_BOTTOM          0x0200
+#define wxSL_RIGHT           (wxSL_BOTTOM | wxVERTICAL)
+#define wxSL_BOTH            0x0400
+#define wxSL_SELRANGE        0x0800
+#define wxSL_INVERSE         0x1000
+
+// obsolete
+#define wxSL_NOTIFY_DRAG     0x0000
+
+

 extern WXDLLEXPORT_DATA(const wxChar*) wxSliderNameStr;
 
 // ----------------------------------------------------------------------------
 extern WXDLLEXPORT_DATA(const wxChar*) wxSliderNameStr;
 
 // ----------------------------------------------------------------------------