new DC API fix

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

diff --git a/wxPython/src/_textctrl.i b/wxPython/src/_textctrl.i
index 493598f3608c84e59bef3a91b4a96c8b56408d3a..3a36c5e3e505ed6b5d6dc4986f518722287c4b17 100644 (file)
--- a/wxPython/src/_textctrl.i
+++ b/wxPython/src/_textctrl.i
@@ -15,9 +15,7 @@
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

-%{
-    DECLARE_DEF_STRING(TextCtrlNameStr);
-%}
+MAKE_CONST_WXSTRING(TextCtrlNameStr);

 
 //---------------------------------------------------------------------------
 %newgroup
 
 //---------------------------------------------------------------------------
 %newgroup


@@ -137,7 +135,7 @@ public:
     long GetRightIndent() const;
     long GetFlags() const;
 
     long GetRightIndent() const;
     long GetFlags() const;
 

-    // returns false if we have any attributes set, true otherwise
+    // returns False if we have any attributes set, True otherwise

     bool IsDefault() const;
 
     // return the attribute having the valid font and colours: it uses the
     bool IsDefault() const;
 
     // return the attribute having the valid font and colours: it uses the


@@ -192,8 +190,11 @@ public:
     bool IsSingleLine() const;
     bool IsMultiLine() const;
 
     bool IsSingleLine() const;
     bool IsMultiLine() const;
 

-    // If the return values from and to are the same, there is no selection.
-    virtual void GetSelection(long* OUTPUT, long* OUTPUT) const;
+
+    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.");

 
     virtual wxString GetStringSelection() const;
 
 
     virtual wxString GetStringSelection() const;
 


@@ -221,7 +222,7 @@ public:
     virtual void AppendText(const wxString& text);
 
     // insert the character which would have resulted from this key event,
     virtual void AppendText(const wxString& text);
 
     // insert the character which would have resulted from this key event,

-    // return TRUE if anything has been inserted
+    // return True if anything has been inserted

     virtual bool EmulateKeyPress(const wxKeyEvent& event);
 
     // text control under some platforms supports the text styles: these
     virtual bool EmulateKeyPress(const wxKeyEvent& event);
 
     // text control under some platforms supports the text styles: these


@@ -236,7 +237,9 @@ public:
     // considering all its contents as a single strings) and (x, y) coordinates
     // which represent column and line.
     virtual long XYToPosition(long x, long y) const;
     // considering all its contents as a single strings) and (x, y) coordinates
     // which represent column and line.
     virtual long XYToPosition(long x, long y) const;

-    virtual /*bool*/ void PositionToXY(long pos, long *OUTPUT, long *OUTPUT) const;
+    DocDeclA(
+        virtual /*bool*/ void, PositionToXY(long pos, long *OUTPUT, long *OUTPUT) const,
+        "PositionToXY(long pos) -> (x, y)");

 
     virtual void ShowPosition(long pos);
 
 
     virtual void ShowPosition(long pos);
 


@@ -268,7 +271,7 @@ public:
 
 #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