New wxTE_ flags

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33132 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/src/__controls_rename.i b/wxPython/src/__controls_rename.i
index 65412dca591ab194bc49740dfbfb840e78bbe58b..484cb3c19c212258d1611fce5dfaa69ff9cfdff6 100644 (file)
--- a/wxPython/src/__controls_rename.i
+++ b/wxPython/src/__controls_rename.i
@@ -47,8 +47,10 @@
 %rename(TE_AUTO_URL)                        wxTE_AUTO_URL;
 %rename(TE_NOHIDESEL)                       wxTE_NOHIDESEL;
 %rename(TE_DONTWRAP)                        wxTE_DONTWRAP;
-%rename(TE_LINEWRAP)                        wxTE_LINEWRAP;
+%rename(TE_CHARWRAP)                        wxTE_CHARWRAP;
 %rename(TE_WORDWRAP)                        wxTE_WORDWRAP;
+%rename(TE_BESTWRAP)                        wxTE_BESTWRAP;
+%rename(TE_LINEWRAP)                        wxTE_LINEWRAP;
 %rename(TE_RICH2)                           wxTE_RICH2;
 %rename(TE_CAPITALIZE)                      wxTE_CAPITALIZE;
 %rename(TEXT_ALIGNMENT_DEFAULT)             wxTEXT_ALIGNMENT_DEFAULT;

diff --git a/wxPython/src/_textctrl.i b/wxPython/src/_textctrl.i
index bb51357803ff69b3f56c096ec8d0e9ebb1c2ba69..c8a805833925a4035f744c972e2f524ed0c322ba 100644 (file)
--- a/wxPython/src/_textctrl.i
+++ b/wxPython/src/_textctrl.i
@@ -52,11 +52,17 @@ enum {
     // doesn't have focus - use this style to force it to always show it
     wxTE_NOHIDESEL,
 
-    // use wxHSCROLL to not wrap text at all, wxTE_LINEWRAP to wrap it at any
-    // position and wxTE_WORDWRAP to wrap at words boundary
+    // use wxHSCROLL (wxTE_DONTWRAP) to not wrap text at all, wxTE_CHARWRAP to
+    // wrap it at any position and wxTE_WORDWRAP to wrap at words boundary
+    //
+    // if no wrapping style is given at all, the control wraps at word boundary
     wxTE_DONTWRAP,
-    wxTE_LINEWRAP,
+    wxTE_CHARWRAP,
     wxTE_WORDWRAP,
+    wxTE_BESTWRAP,
+
+    // obsolete synonym
+    wxTE_LINEWRAP,
 
     // force using RichEdit version 2.0 or 3.0 instead of 1.0 (default) for
     // wxTE_RICH controls - can be used together with or instead of wxTE_RICH

diff --git a/wxPython/wxPython/_controls.py b/wxPython/wxPython/_controls.py
index e13d7eed2dcbd71860b5ddc825ce7192bc8f6728..ac7efc3c4ce21e1726d9ce83fa8f895f4fd23695 100644 (file)
--- a/wxPython/wxPython/_controls.py
+++ b/wxPython/wxPython/_controls.py
@@ -109,8 +109,10 @@ wxTE_PASSWORD = wx._controls.TE_PASSWORD
 wxTE_AUTO_URL = wx._controls.TE_AUTO_URL
 wxTE_NOHIDESEL = wx._controls.TE_NOHIDESEL
 wxTE_DONTWRAP = wx._controls.TE_DONTWRAP
-wxTE_LINEWRAP = wx._controls.TE_LINEWRAP
+wxTE_CHARWRAP = wx._controls.TE_CHARWRAP
 wxTE_WORDWRAP = wx._controls.TE_WORDWRAP
+wxTE_BESTWRAP = wx._controls.TE_BESTWRAP
+wxTE_LINEWRAP = wx._controls.TE_LINEWRAP
 wxTE_RICH2 = wx._controls.TE_RICH2
 wxTE_CAPITALIZE = wx._controls.TE_CAPITALIZE
 wxTEXT_ALIGNMENT_DEFAULT = wx._controls.TEXT_ALIGNMENT_DEFAULT