From: Vadim Zeitlin Date: Sun, 25 Nov 2001 18:11:47 +0000 (+0000) Subject: fixed wxTE_LINESCROLL definition to not conflict with wxTE_PROCESS_ENTER X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/65c12361f3f1428628476547c4087cf3cbb9c105 fixed wxTE_LINESCROLL definition to not conflict with wxTE_PROCESS_ENTER git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12691 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/textctrl.h b/include/wx/textctrl.h index 25c0c09dfa..49abd90947 100644 --- a/include/wx/textctrl.h +++ b/include/wx/textctrl.h @@ -82,6 +82,12 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString; // doesn't have focus - use this style to force it to always show it #define wxTE_NOHIDESEL 0x2000 +// use wxHSCROLL to not wrap text at all, wxTE_LINEWRAP to wrap it at any +// position and wxTE_WORDWRAP to wrap at words boundary +#define wxTE_DONTWRAP wxHSCROLL +#define wxTE_LINEWRAP 0x4000 +#define wxTE_WORDWRAP 0x0000 // it's just == !wxHSCROLL + // ---------------------------------------------------------------------------- // wxTextAttr: a structure containing the visual attributes of a text // ----------------------------------------------------------------------------