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

Change wxSP_XXX flags values to avoid clashes with wxTE_XXX.

Browse Source 
wxSP_ARROW_KEYS conflicted with wxTE_AUTO_URL (which was probably not
important in practice as URLs don't appear in spin controls anyhow) and wxSPWR
conflicted with wxTE_NOHIDESEL (which could conceivably be a problem).

Change their values to reuse the bits of wxTE_CHARWRAP and wxTE_RICH2 neither
of which definitely makes sense for a spin control.

Closes #11461.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65847 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-10-18 23:43:25 +00:00
parent 1780a38b7b
commit 02a4d0b7a0
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/wx/defs.h
View File

@@ -1813,14 +1813,15 @@ enum wxBorder
/* /*
* wxSpinButton flags. * wxSpinButton flags.
* Note that a wxSpinCtrl is sometimes defined as * Note that a wxSpinCtrl is sometimes defined as a wxTextCtrl, and so the
* a wxTextCtrl, and so the flags must be different * flags shouldn't overlap with wxTextCtrl flags that can be used for a single
* from wxTextCtrl's. * line controls (currently we reuse wxTE_CHARWRAP and wxTE_RICH2 neither of
* which makes sense for them).
*/ */
#define wxSP_HORIZONTAL wxHORIZONTAL /* 4 */ #define wxSP_HORIZONTAL wxHORIZONTAL /* 4 */
#define wxSP_VERTICAL wxVERTICAL /* 8 */ #define wxSP_VERTICAL wxVERTICAL /* 8 */
#define wxSP_ARROW_KEYS 0x1000 #define wxSP_ARROW_KEYS 0x4000
#define wxSP_WRAP 0x2000 #define wxSP_WRAP 0x8000
/* /*
* wxTabCtrl flags * wxTabCtrl flags