X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/30fc5e8fee1557e4049d35d416d76a2bebdd8780..955e46d25d6ac0f9fa55ec9fe11f0c21da3a494d:/wxPython/src/richtext.i

diff --git a/wxPython/src/richtext.i b/wxPython/src/richtext.i
index ba35f57485..12c1d69644 100644
--- a/wxPython/src/richtext.i
+++ b/wxPython/src/richtext.i
@@ -39,7 +39,7 @@ class wxPrinterDC;
 //----------------------------------------------------------------------
 
 %import windows.i
-%import gdi.i
+// ??  %import gdi.i
 
 %pythoncode { wx = _core }
 %pythoncode { __docfilter__ = wx.__DocFilter(globals()) }
@@ -422,6 +422,13 @@ public:
     // 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
+//     // attributes set in attr and falls back first to attrDefault and then to
+//     // the text control font/colours for those attributes which are not set
+//     static wxRichTextAttr Combine(const wxRichTextAttr& attr,
+//                               const wxRichTextAttr& attrDef,
+//                               const wxTextCtrlBase *text);
 };
 
 
@@ -447,6 +454,7 @@ public:
 
     wxRichTextCtrl( wxWindow* parent,
                     wxWindowID id = -1,
+                    const wxString& value = wxPyEmptyString,
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize,
                     long style = wxRE_MULTILINE );
@@ -455,6 +463,7 @@ public:
 
     bool Create( wxWindow* parent,
                  wxWindowID id = -1,
+                 const wxString& value = wxPyEmptyString,
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = wxRE_MULTILINE );
@@ -562,7 +571,7 @@ during sizing.", "");
         virtual bool , SaveFile(const wxString& file = wxPyEmptyString,
                                 int type = wxRICHTEXT_TYPE_ANY),
         "Save the contents of the document to the given filename, or if the
-empty string is passed then to the filename set with `SetFileName`.", "");
+empty string is passed then to the filename set with `SetFilename`.", "");
 
 
     // sets/clears the dirty flag