From 02a4d0b7a0941f937e09ff44fbb670cbba1f1b5a Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 18 Oct 2010 23:43:25 +0000 Subject: [PATCH] Change wxSP_XXX flags values to avoid clashes with wxTE_XXX. 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 --- include/wx/defs.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/include/wx/defs.h b/include/wx/defs.h index 5e006edbf2..5dc4696a53 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -1813,14 +1813,15 @@ enum wxBorder /* * wxSpinButton flags. - * Note that a wxSpinCtrl is sometimes defined as - * a wxTextCtrl, and so the flags must be different - * from wxTextCtrl's. + * Note that a wxSpinCtrl is sometimes defined as a wxTextCtrl, and so the + * flags shouldn't overlap with wxTextCtrl flags that can be used for a single + * line controls (currently we reuse wxTE_CHARWRAP and wxTE_RICH2 neither of + * which makes sense for them). */ #define wxSP_HORIZONTAL wxHORIZONTAL /* 4 */ #define wxSP_VERTICAL wxVERTICAL /* 8 */ -#define wxSP_ARROW_KEYS 0x1000 -#define wxSP_WRAP 0x2000 +#define wxSP_ARROW_KEYS 0x4000 +#define wxSP_WRAP 0x8000 /* * wxTabCtrl flags -- 2.47.2