Regenerate to add the new file toucan.png.

[wxWidgets.git] / wxPython / src / _textctrl.i

diff --git a/wxPython/src/_textctrl.i b/wxPython/src/_textctrl.i
index bb51357803ff69b3f56c096ec8d0e9ebb1c2ba69..acf79226fca06a3d3bf10af926b386962b11b8f6 100644 (file)
--- a/wxPython/src/_textctrl.i
+++ b/wxPython/src/_textctrl.i
@@ -52,11 +52,14 @@ 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,
 
     // 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
@@ -65,6 +68,9 @@ enum {
     wxTE_CAPITALIZE,
 };
 
+%pythoncode { TE_LINEWRAP = TE_CHARWRAP }
+
+
 
 enum wxTextAttrAlignment
 {
@@ -122,6 +128,16 @@ public:
     // operations
     void Init();
 
+    // merges the attributes of the base and the overlay objects and returns
+    // the result; the parameter attributes take precedence
+    //
+    // WARNING: the order of arguments is the opposite of Combine()
+    static wxTextAttr Merge(const wxTextAttr& base, const wxTextAttr& overlay);
+    
+//     // merges the attributes of this object and overlay
+//     void Merge(const wxTextAttr& overlay);
+
+    
     // setters
     void SetTextColour(const wxColour& colText);
     void SetBackgroundColour(const wxColour& colBack);