From 2f78bd2c0436624590642c7756810d8c999c0c35 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 2 Sep 1999 05:38:48 +0000 Subject: [PATCH] fixed a clash in values for wxSlider styles git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3552 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/defs.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/include/wx/defs.h b/include/wx/defs.h index 48d5bbd3ce..49b1187410 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -133,7 +133,7 @@ #if defined(__HPUX__) && defined(__GNUG__) #define va_list __gnuc_va_list #endif // HP-UX - + // Mingw32 gcc-2.95 uses new windows headers which are more ms-like // we are setting this define because of the complex check // using NORLANDER as Cygwin may follow. (header author is Anders Norlander) @@ -603,7 +603,7 @@ enum wxOrientation { wxHORIZONTAL = 0x0004, wxVERTICAL = 0x0008, - + wxBOTH = (wxVERTICAL | wxHORIZONTAL) }; @@ -613,15 +613,15 @@ enum wxDirection wxRIGHT = 0x0020, wxUP = 0x0040, wxDOWN = 0x0080, - + wxTOP = wxUP, wxBOTTOM = wxDOWN, - + wxNORTH = wxUP, wxSOUTH = wxDOWN, wxWEST = wxLEFT, wxEAST = wxRIGHT, - + wxALL = (wxUP | wxDOWN | wxRIGHT | wxLEFT) }; @@ -845,11 +845,11 @@ enum wxStretch /* * wxSlider flags */ -#define wxSL_HORIZONTAL wxHORIZONTAL -#define wxSL_VERTICAL wxVERTICAL +#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_AUTOTICKS 0x0008 +#define wxSL_AUTOTICKS 0x0010 // #define wxSL_MANUALTICKS 0x0010 #define wxSL_LABELS 0x0020 #define wxSL_LEFT 0x0040 -- 2.47.2