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 25c0c09dfafa8d3a33fef39a118adefea36031cd..49abd909472d61be2385aeb2ea786fecea19d0e9 100644 (file)
--- 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
 
 // 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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxTextAttr: a structure containing the visual attributes of a text
 // ----------------------------------------------------------------------------