Fix compilation of wxFormBuilder-generated code using wxTE_XXX
Move definitions of wxTE_XXX flags that can be used with the controls other than wxTextCtrl to wx/defs.h, as wxFormBuilder generates code using them without including wx/textctrl.h, so that this code doesn't compile. This was already addressed in2970f22a89
(Include <wx/textctrl.h> from <wx/combobox.h> for compatibility., 2012-03-25) for wxComboBox, but it also happened for wxSpinCtrl, so fix it once and for all by always defining these styles. This partially reverts the changes done inc57e33394c
([...] moved wxTextCtrl-specific stuff from defs.h/event.h to textctrl.h, 2001-07-29) as it turns out, 20 years later, that this wasn't such a great idea. See #14132. Closes #19225.
This commit is contained in:
@@ -57,11 +57,9 @@ const wxTextCoord wxInvalidTextCoord = -2;
|
||||
// wxTextCtrl style flags
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
#define wxTE_NO_VSCROLL 0x0002
|
||||
// Some of wxTE_XXX are defined in wx/defs.h, they take 0x0C70 bits.
|
||||
|
||||
#define wxTE_READONLY 0x0010
|
||||
#define wxTE_MULTILINE 0x0020
|
||||
#define wxTE_PROCESS_TAB 0x0040
|
||||
#define wxTE_NO_VSCROLL 0x0002
|
||||
|
||||
// alignment flags
|
||||
#define wxTE_LEFT 0x0000 // 0x0000
|
||||
@@ -73,9 +71,6 @@ const wxTextCoord wxInvalidTextCoord = -2;
|
||||
// and Win32 and is silently ignored under all other platforms
|
||||
#define wxTE_RICH 0x0080
|
||||
|
||||
#define wxTE_PROCESS_ENTER 0x0400
|
||||
#define wxTE_PASSWORD 0x0800
|
||||
|
||||
// automatically detect the URLs and generate the events when mouse is
|
||||
// moved/clicked over an URL
|
||||
//
|
||||
|
Reference in New Issue
Block a user