X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b0f7404b924646d088c8d7be13781176ea84bb68..b519803b436486ca933d750c990ef64a29551221:/wxPython/src/msw/html.py?ds=sidebyside

diff --git a/wxPython/src/msw/html.py b/wxPython/src/msw/html.py
index 75d51cc526..aa45347a94 100644
--- a/wxPython/src/msw/html.py
+++ b/wxPython/src/msw/html.py
@@ -227,6 +227,10 @@ class HtmlWinParser(HtmlParser):
         """SetFonts(self, String normal_face, String fixed_face, PyObject sizes=None)"""
         return _html.HtmlWinParser_SetFonts(*args, **kwargs)
 
+    def SetStandardFonts(*args, **kwargs):
+        """SetStandardFonts(self, int size=-1, String normal_face=EmptyString, String fixed_face=EmptyString)"""
+        return _html.HtmlWinParser_SetStandardFonts(*args, **kwargs)
+
     def GetContainer(*args, **kwargs):
         """GetContainer(self) -> HtmlContainerCell"""
         return _html.HtmlWinParser_GetContainer(*args, **kwargs)
@@ -1008,6 +1012,10 @@ class HtmlWindow(_windows.ScrolledWindow):
         """SetFonts(self, String normal_face, String fixed_face, PyObject sizes=None)"""
         return _html.HtmlWindow_SetFonts(*args, **kwargs)
 
+    def SetStandardFonts(*args, **kwargs):
+        """SetStandardFonts(self, int size=-1, String normal_face=EmptyString, String fixed_face=EmptyString)"""
+        return _html.HtmlWindow_SetStandardFonts(*args, **kwargs)
+
     def SetTitle(*args, **kwargs):
         """SetTitle(self, String title)"""
         return _html.HtmlWindow_SetTitle(*args, **kwargs)
@@ -1187,9 +1195,13 @@ class HtmlDCRenderer(_core.Object):
         """SetFonts(self, String normal_face, String fixed_face, PyObject sizes=None)"""
         return _html.HtmlDCRenderer_SetFonts(*args, **kwargs)
 
+    def SetStandardFonts(*args, **kwargs):
+        """SetStandardFonts(self, int size=-1, String normal_face=EmptyString, String fixed_face=EmptyString)"""
+        return _html.HtmlDCRenderer_SetStandardFonts(*args, **kwargs)
+
     def Render(*args, **kwargs):
         """
-        Render(self, int x, int y, int from=0, int dont_render=False, int to=INT_MAX, 
+        Render(self, int x, int y, int from=0, int dont_render=False, int maxHeight=INT_MAX, 
             int choices=None, int LCOUNT=0) -> int
         """
         return _html.HtmlDCRenderer_Render(*args, **kwargs)
@@ -1238,6 +1250,10 @@ class HtmlPrintout(_windows.Printout):
         """SetFonts(self, String normal_face, String fixed_face, PyObject sizes=None)"""
         return _html.HtmlPrintout_SetFonts(*args, **kwargs)
 
+    def SetStandardFonts(*args, **kwargs):
+        """SetStandardFonts(self, int size=-1, String normal_face=EmptyString, String fixed_face=EmptyString)"""
+        return _html.HtmlPrintout_SetStandardFonts(*args, **kwargs)
+
     def SetMargins(*args, **kwargs):
         """
         SetMargins(self, float top=25.2, float bottom=25.2, float left=25.2, 
@@ -1302,10 +1318,6 @@ class HtmlEasyPrinting(_core.Object):
         """PrintText(self, String htmltext, String basepath=EmptyString)"""
         return _html.HtmlEasyPrinting_PrintText(*args, **kwargs)
 
-    def PrinterSetup(*args, **kwargs):
-        """PrinterSetup(self)"""
-        return _html.HtmlEasyPrinting_PrinterSetup(*args, **kwargs)
-
     def PageSetup(*args, **kwargs):
         """PageSetup(self)"""
         return _html.HtmlEasyPrinting_PageSetup(*args, **kwargs)
@@ -1322,6 +1334,10 @@ class HtmlEasyPrinting(_core.Object):
         """SetFonts(self, String normal_face, String fixed_face, PyObject sizes=None)"""
         return _html.HtmlEasyPrinting_SetFonts(*args, **kwargs)
 
+    def SetStandardFonts(*args, **kwargs):
+        """SetStandardFonts(self, int size=-1, String normal_face=EmptyString, String fixed_face=EmptyString)"""
+        return _html.HtmlEasyPrinting_SetStandardFonts(*args, **kwargs)
+
     def GetPrintData(*args, **kwargs):
         """GetPrintData(self) -> PrintData"""
         return _html.HtmlEasyPrinting_GetPrintData(*args, **kwargs)
@@ -1599,7 +1615,7 @@ HF_BOOKMARKS = _html.HF_BOOKMARKS
 HF_OPENFILES = _html.HF_OPENFILES
 HF_PRINT = _html.HF_PRINT
 HF_DEFAULTSTYLE = _html.HF_DEFAULTSTYLE
-class HtmlHelpController(_core.EvtHandler):
+class HtmlHelpController(_core.Object):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlHelpController instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
@@ -1608,8 +1624,6 @@ class HtmlHelpController(_core.EvtHandler):
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
-        self._setOORInfo(self)
-
     def __del__(self, destroy=_html.delete_HtmlHelpController):
         """__del__(self)"""
         try: