Add wx.Dialog.Get/SetAffirmativeId and Get/SetEscapeId

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

diff --git a/wxPython/src/_textctrl.i b/wxPython/src/_textctrl.i
index e54457e723087e78df3d7c9ab0d688608640ad76..c8a805833925a4035f744c972e2f524ed0c322ba 100644 (file)
--- a/wxPython/src/_textctrl.i
+++ b/wxPython/src/_textctrl.i
@@ -52,15 +52,23 @@ enum {
     // doesn't have focus - use this style to force it to always show it
     wxTE_NOHIDESEL,
 
     // 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_DONTWRAP,

-    wxTE_LINEWRAP,
+    wxTE_CHARWRAP,

     wxTE_WORDWRAP,
     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
     wxTE_RICH2,
 
     // 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
     wxTE_RICH2,

+
+    wxTE_CAPITALIZE,

 };
 
 
 };
 
 


@@ -99,6 +107,12 @@ enum wxTextCtrlHitTestResult
     wxTE_HT_BEYOND          // after [the end of line]
 };
 
     wxTE_HT_BEYOND          // after [the end of line]
 };
 

+
+enum {
+    wxOutOfRangeTextCoord,
+    wxInvalidTextCoord
+};
+

 //---------------------------------------------------------------------------
 
 // wxTextAttr: a structure containing the visual attributes of a text
 //---------------------------------------------------------------------------
 
 // wxTextAttr: a structure containing the visual attributes of a text


@@ -174,7 +188,7 @@ public:
                long style = 0,
                const wxValidator& validator = wxDefaultValidator,
                const wxString& name = wxPyTextCtrlNameStr);
                long style = 0,
                const wxValidator& validator = wxDefaultValidator,
                const wxString& name = wxPyTextCtrlNameStr);

-    %name(PreTextCtrl)wxTextCtrl();
+    %RenameCtor(PreTextCtrl, wxTextCtrl());

 
     // Turn it back on again
     %typemap(out) wxTextCtrl* { $result = wxPyMake_wxObject($1, $owner); }
 
     // Turn it back on again
     %typemap(out) wxTextCtrl* { $result = wxPyMake_wxObject($1, $owner); }


@@ -261,7 +275,7 @@ public:
     DocDeclAStr(
         virtual wxTextCtrlHitTestResult, HitTest(const wxPoint& pt,
                                                  long* OUTPUT, long* OUTPUT) const,
     DocDeclAStr(
         virtual wxTextCtrlHitTestResult, HitTest(const wxPoint& pt,
                                                  long* OUTPUT, long* OUTPUT) const,

-        "HitTest(Point pt) -> (result, row, col)",
+        "HitTest(Point pt) -> (result, col, row)",

         "Find the row, col coresponding to the character at the point given in
 pixels. NB: pt is in device coords but is not adjusted for the client
 area origin nor scrolling.", "");
         "Find the row, col coresponding to the character at the point given in
 pixels. NB: pt is in device coords but is not adjusted for the client
 area origin nor scrolling.", "");


@@ -305,7 +319,7 @@ the client area origin nor scrolling. ", "",
 
 #ifdef __WXMSW__
     // Caret handling (Windows only)
 
 #ifdef __WXMSW__
     // Caret handling (Windows only)

-    bool ShowNativeCaret(bool show = True);
+    bool ShowNativeCaret(bool show = true);

     bool HideNativeCaret();
 #endif
 
     bool HideNativeCaret();
 #endif