no need to %import gdi.i

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39992 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/src/richtext.i b/wxPython/src/richtext.i
index ba35f574858ad9eb5af589b78a160d4d557e39ee..5537b3635d4d90e0c06c0562bebb956b8dd02034 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);

 };
 
 
 };