Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed a clash in values for wxSlider styles

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3552 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
1999-09-02 05:38:48 +00:00
parent ac1edf3546
commit 2f78bd2c04
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/wx/defs.h
View File

@@ -133,7 +133,7 @@
#if defined(__HPUX__) && defined(__GNUG__) #if defined(__HPUX__) && defined(__GNUG__)
#define va_list __gnuc_va_list #define va_list __gnuc_va_list
#endif // HP-UX #endif // HP-UX
// Mingw32 gcc-2.95 uses new windows headers which are more ms-like // Mingw32 gcc-2.95 uses new windows headers which are more ms-like
// we are setting this define because of the complex check // we are setting this define because of the complex check
// using NORLANDER as Cygwin may follow. (header author is Anders Norlander) // using NORLANDER as Cygwin may follow. (header author is Anders Norlander)
@@ -603,7 +603,7 @@ enum wxOrientation
{ {
wxHORIZONTAL = 0x0004, wxHORIZONTAL = 0x0004,
wxVERTICAL = 0x0008, wxVERTICAL = 0x0008,
wxBOTH = (wxVERTICAL | wxHORIZONTAL) wxBOTH = (wxVERTICAL | wxHORIZONTAL)
}; };
@@ -613,15 +613,15 @@ enum wxDirection
wxRIGHT = 0x0020, wxRIGHT = 0x0020,
wxUP = 0x0040, wxUP = 0x0040,
wxDOWN = 0x0080, wxDOWN = 0x0080,
wxTOP = wxUP, wxTOP = wxUP,
wxBOTTOM = wxDOWN, wxBOTTOM = wxDOWN,
wxNORTH = wxUP, wxNORTH = wxUP,
wxSOUTH = wxDOWN, wxSOUTH = wxDOWN,
wxWEST = wxLEFT, wxWEST = wxLEFT,
wxEAST = wxRIGHT, wxEAST = wxRIGHT,
wxALL = (wxUP | wxDOWN | wxRIGHT | wxLEFT) wxALL = (wxUP | wxDOWN | wxRIGHT | wxLEFT)
}; };
@@ -845,11 +845,11 @@ enum wxStretch
/* /*
* wxSlider flags * wxSlider flags
*/ */
#define wxSL_HORIZONTAL wxHORIZONTAL #define wxSL_HORIZONTAL wxHORIZONTAL // 4
#define wxSL_VERTICAL wxVERTICAL #define wxSL_VERTICAL wxVERTICAL // 8
// The next one is obsolete - use scroll events instead // The next one is obsolete - use scroll events instead
#define wxSL_NOTIFY_DRAG 0x0000 #define wxSL_NOTIFY_DRAG 0x0000
#define wxSL_AUTOTICKS 0x0008 #define wxSL_AUTOTICKS 0x0010
// #define wxSL_MANUALTICKS 0x0010 // #define wxSL_MANUALTICKS 0x0010
#define wxSL_LABELS 0x0020 #define wxSL_LABELS 0x0020
#define wxSL_LEFT 0x0040 #define wxSL_LEFT 0x0040