Doh! I changed the AddPane parameter names but didn't change their usage.

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

diff --git a/wxPython/src/richtext.i b/wxPython/src/richtext.i
index ba35f574858ad9eb5af589b78a160d4d557e39ee..c99edf1ec0dd578ea178c7c480aedaf0974308a8 100644 (file)
--- a/wxPython/src/richtext.i
+++ b/wxPython/src/richtext.i
@@ -39,7 +39,7 @@ class wxPrinterDC;
 //----------------------------------------------------------------------
 
 %import windows.i
 //----------------------------------------------------------------------
 
 %import windows.i

-%import gdi.i
+// ??  %import gdi.i

 
 %pythoncode { wx = _core }
 %pythoncode { __docfilter__ = wx.__DocFilter(globals()) }
 
 %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;
 
     // 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,
 
     wxRichTextCtrl( wxWindow* parent,
                     wxWindowID id = -1,

+                    const wxString& value = wxPyEmptyString,

                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize,
                     long style = wxRE_MULTILINE );
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize,
                     long style = wxRE_MULTILINE );


@@ -455,6 +463,7 @@ public:
 
     bool Create( wxWindow* parent,
                  wxWindowID id = -1,
 
     bool Create( wxWindow* parent,
                  wxWindowID id = -1,

+                 const wxString& value = wxPyEmptyString,

                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = wxRE_MULTILINE );
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = wxRE_MULTILINE );