Change the other OnAssert --> OnAssertFailure

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

diff --git a/wxPython/src/_textctrl.i b/wxPython/src/_textctrl.i
index f1e89934f5653f56742034d248e1c2084481d5f1..71d8ef2b65b65dc72f56a13eb9b788a4a9c2983f 100644 (file)
--- a/wxPython/src/_textctrl.i
+++ b/wxPython/src/_textctrl.i
@@ -52,17 +52,25 @@ 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,

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

 };
 
 };
 

+%pythoncode { TE_LINEWRAP = TE_CHARWRAP }
+
+

 
 enum wxTextAttrAlignment
 {
 
 enum wxTextAttrAlignment
 {


@@ -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


@@ -114,6 +128,16 @@ public:
     // operations
     void Init();
 
     // 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);
     // setters
     void SetTextColour(const wxColour& colText);
     void SetBackgroundColour(const wxColour& colBack);


@@ -174,7 +198,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); }


@@ -225,7 +249,8 @@ public:
     // sets/clears the dirty flag
     virtual void MarkDirty();
     virtual void DiscardEdits();
     // sets/clears the dirty flag
     virtual void MarkDirty();
     virtual void DiscardEdits();

-
+    void SetModified(bool modified);
+    

     // set the max number of characters which may be entered in a single line
     // text control
     virtual void SetMaxLength(unsigned long len);
     // set the max number of characters which may be entered in a single line
     // text control
     virtual void SetMaxLength(unsigned long len);


@@ -261,11 +286,22 @@ 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)",
-        "Find the character at position given in pixels. NB: pt is in device
-coords but is not adjusted for the client area origin nor scrolling", "");
+        "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.", "");
+

 
 

+    DocDeclAStrName(
+        virtual wxTextCtrlHitTestResult , HitTest(const wxPoint& pt, long *OUTPUT) const,
+        "HitTestPos(Point pt) -> (result, position)",
+        "Find the character position in the text coresponding to the point
+given in pixels. NB: pt is in device coords but is not adjusted for
+the client area origin nor scrolling. ", "",
+        HitTestPos);

 
 

+    
+    

     // Clipboard operations
     virtual void Copy();
     virtual void Cut();
     // Clipboard operations
     virtual void Copy();
     virtual void Cut();


@@ -294,7 +330,7 @@ coords but is not adjusted for 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