Add GetHDC back

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

diff --git a/wxPython/src/html.i b/wxPython/src/html.i
index 535ff6aeee4d04ab111394c785e84af42acf8d05..412fcb3b507600b610138e877f20b9e6cd916c30 100644 (file)
--- a/wxPython/src/html.i
+++ b/wxPython/src/html.i
@@ -10,8 +10,11 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

+%define DOCSTRING
+"Classes for a simple HTML rendering window, HTML Help Window, etc."
+%enddef

 
 

-%module html
+%module(docstring=DOCSTRING) html

 
 %{
 #include "wx/wxPython/wxPython.h"
 
 %{
 #include "wx/wxPython/wxPython.h"


@@ -29,8 +32,8 @@
 //---------------------------------------------------------------------------
 
 %import windows.i
 //---------------------------------------------------------------------------
 
 %import windows.i

-%pythoncode { wx = core }
-%pythoncode { __docfilter__ = wx.__docfilter__ }
+%pythoncode { wx = _core }
+%pythoncode { __docfilter__ = wx.__DocFilter(globals()) }

 
 %include _html_rename.i
 
 
 %include _html_rename.i
 


@@ -858,7 +861,7 @@ public:
 
     DocDeclStr(
         void, SetTitle(const wxString& title),
 
     DocDeclStr(
         void, SetTitle(const wxString& title),

-        "");
+        "", "");

 
     // Sets space between text and window borders.
     void SetBorders(int b);
 
     // Sets space between text and window borders.
     void SetBorders(int b);


@@ -903,6 +906,9 @@ public:
     void base_OnCellClicked(wxHtmlCell *cell,
                             wxCoord x, wxCoord y,
                             const wxMouseEvent& event);
     void base_OnCellClicked(wxHtmlCell *cell,
                             wxCoord x, wxCoord y,
                             const wxMouseEvent& event);

+
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);

 };
 
 
 };