X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/322913cef36b156a4a9722ce6a68845e3219e615..571d14b2621325840e465e1e55be9f5a362a5dbd:/wxPython/src/_textctrl.i

diff --git a/wxPython/src/_textctrl.i b/wxPython/src/_textctrl.i
index b83c30dacf..7110d61466 100644
--- a/wxPython/src/_textctrl.i
+++ b/wxPython/src/_textctrl.i
@@ -15,9 +15,7 @@
 
 //---------------------------------------------------------------------------
 
-%{
-    DECLARE_DEF_STRING(TextCtrlNameStr);
-%}
+MAKE_CONST_WXSTRING(TextCtrlNameStr);
 
 //---------------------------------------------------------------------------
 %newgroup
@@ -92,6 +90,15 @@ enum {
     wxTEXT_ATTR_TABS
 };
 
+enum wxTextCtrlHitTestResult
+{
+    wxTE_HT_UNKNOWN = -2,   // this means HitTest() is simply not implemented
+    wxTE_HT_BEFORE,         // either to the left or upper
+    wxTE_HT_ON_TEXT,        // directly on
+    wxTE_HT_BELOW,          // below [the last line]
+    wxTE_HT_BEYOND          // after [the end of line]
+};
+
 //---------------------------------------------------------------------------
 
 // wxTextAttr: a structure containing the visual attributes of a text
@@ -104,7 +111,8 @@ public:
                const wxColour& colBack = wxNullColour,
                const wxFont& font = wxNullFont,
                wxTextAttrAlignment alignment = wxTEXT_ALIGNMENT_DEFAULT);
-
+    ~wxTextAttr();
+    
     // operations
     void Init();
 
@@ -155,8 +163,8 @@ public:
 class wxTextCtrl : public wxControl
 {
 public:
-    %addtofunc wxTextCtrl         "self._setOORInfo(self)"
-    %addtofunc wxTextCtrl()       ""
+    %pythonAppend wxTextCtrl         "self._setOORInfo(self)"
+    %pythonAppend wxTextCtrl()       ""
 
     wxTextCtrl(wxWindow* parent, wxWindowID id,
                const wxString& value = wxPyEmptyString,
@@ -196,7 +204,7 @@ public:
     DocDeclAStr(
         virtual void, GetSelection(long* OUTPUT, long* OUTPUT) const,
         "GetSelection() -> (from, to)",
-        "If the return values from and to are the same, there is no selection.");
+        "If the return values from and to are the same, there is no selection.", "");
 
     virtual wxString GetStringSelection() const;
 
@@ -245,6 +253,15 @@ public:
 
     virtual void ShowPosition(long pos);
 
+
+    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", "");
+
+
     // Clipboard operations
     virtual void Copy();
     virtual void Cut();
@@ -291,6 +308,8 @@ public:
         }
     }
 
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 };
 
 //---------------------------------------------------------------------------