Applied patch #1431193: work around for recent fileuri change in mediactrl + fix

[wxWidgets.git] / wxPython / src / gtk / html.py

diff --git a/wxPython/src/gtk/html.py b/wxPython/src/gtk/html.py
index 3e5505565ece02d0d150120c32a59b7885228796..c1b7e69433057a39ef7dcc0a98a40bf1f46d1dea 100644 (file)
--- a/wxPython/src/gtk/html.py
+++ b/wxPython/src/gtk/html.py
@@ -1,8 +1,53 @@
-# This file was created automatically by SWIG.
+# This file was created automatically by SWIG 1.3.27.

 # Don't modify this file, modify the SWIG interface instead.
 
 # Don't modify this file, modify the SWIG interface instead.
 

+"""
+Classes for a simple HTML rendering window, HTML Help Window, etc.
+"""
+

 import _html
 
 import _html
 

+def _swig_setattr_nondynamic(self,class_type,name,value,static=1):
+    if (name == "this"):
+        if isinstance(value, class_type):
+            self.__dict__[name] = value.this
+            if hasattr(value,"thisown"): self.__dict__["thisown"] = value.thisown
+            del value.thisown
+            return
+    method = class_type.__swig_setmethods__.get(name,None)
+    if method: return method(self,value)
+    if (not static) or hasattr(self,name) or (name == "thisown"):
+        self.__dict__[name] = value
+    else:
+        raise AttributeError("You cannot add attributes to %s" % self)
+
+def _swig_setattr(self,class_type,name,value):
+    return _swig_setattr_nondynamic(self,class_type,name,value,0)
+
+def _swig_getattr(self,class_type,name):
+    method = class_type.__swig_getmethods__.get(name,None)
+    if method: return method(self)
+    raise AttributeError,name
+
+import types
+try:
+    _object = types.ObjectType
+    _newclass = 1
+except AttributeError:
+    class _object : pass
+    _newclass = 0
+del types
+
+
+def _swig_setattr_nondynamic_method(set):
+    def set_attr(self,name,value):
+        if hasattr(self,name) or (name in ("this", "thisown")):
+            set(self,name,value)
+        else:
+            raise AttributeError("You cannot add attributes to %s" % self)
+    return set_attr
+
+

 import _windows
 import _core
 wx = _core 
 import _windows
 import _core
 wx = _core 


@@ -46,6 +91,7 @@ HTML_URL_PAGE = _html.HTML_URL_PAGE
 HTML_URL_IMAGE = _html.HTML_URL_IMAGE
 HTML_URL_OTHER = _html.HTML_URL_OTHER
 class HtmlLinkInfo(_core.Object):
 HTML_URL_IMAGE = _html.HTML_URL_IMAGE
 HTML_URL_OTHER = _html.HTML_URL_OTHER
 class HtmlLinkInfo(_core.Object):

+    """Proxy of C++ HtmlLinkInfo class"""

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlLinkInfo instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlLinkInfo instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):


@@ -91,6 +137,7 @@ HtmlPrintoutTitleStr = cvar.HtmlPrintoutTitleStr
 HtmlPrintingTitleStr = cvar.HtmlPrintingTitleStr
 
 class HtmlTag(_core.Object):
 HtmlPrintingTitleStr = cvar.HtmlPrintingTitleStr
 
 class HtmlTag(_core.Object):

+    """Proxy of C++ HtmlTag class"""

     def __init__(self): raise RuntimeError, "No constructor defined"
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlTag instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self): raise RuntimeError, "No constructor defined"
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlTag instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)


@@ -135,6 +182,7 @@ class HtmlTagPtr(HtmlTag):
 _html.HtmlTag_swigregister(HtmlTagPtr)
 
 class HtmlParser(_core.Object):
 _html.HtmlTag_swigregister(HtmlTagPtr)
 
 class HtmlParser(_core.Object):

+    """Proxy of C++ HtmlParser class"""

     def __init__(self): raise RuntimeError, "No constructor defined"
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlParser instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self): raise RuntimeError, "No constructor defined"
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlParser instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)


@@ -191,6 +239,7 @@ class HtmlParserPtr(HtmlParser):
 _html.HtmlParser_swigregister(HtmlParserPtr)
 
 class HtmlWinParser(HtmlParser):
 _html.HtmlParser_swigregister(HtmlParserPtr)
 
 class HtmlWinParser(HtmlParser):

+    """Proxy of C++ HtmlWinParser class"""

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlWinParser instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlWinParser instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):


@@ -223,6 +272,10 @@ class HtmlWinParser(HtmlParser):
         """SetFonts(self, String normal_face, String fixed_face, PyObject sizes=None)"""
         return _html.HtmlWinParser_SetFonts(*args, **kwargs)
 
         """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)
     def GetContainer(*args, **kwargs):
         """GetContainer(self) -> HtmlContainerCell"""
         return _html.HtmlWinParser_GetContainer(*args, **kwargs)


@@ -303,6 +356,9 @@ class HtmlWinParser(HtmlParser):
         """SetActualColor(self, Colour clr)"""
         return _html.HtmlWinParser_SetActualColor(*args, **kwargs)
 
         """SetActualColor(self, Colour clr)"""
         return _html.HtmlWinParser_SetActualColor(*args, **kwargs)
 

+    GetActualColour = GetActualColor
+    SetActualColour = SetActualColor
+

     def SetLink(*args, **kwargs):
         """SetLink(self, String link)"""
         return _html.HtmlWinParser_SetLink(*args, **kwargs)
     def SetLink(*args, **kwargs):
         """SetLink(self, String link)"""
         return _html.HtmlWinParser_SetLink(*args, **kwargs)


@@ -324,6 +380,7 @@ class HtmlWinParserPtr(HtmlWinParser):
 _html.HtmlWinParser_swigregister(HtmlWinParserPtr)
 
 class HtmlTagHandler(_core.Object):
 _html.HtmlWinParser_swigregister(HtmlWinParserPtr)
 
 class HtmlTagHandler(_core.Object):

+    """Proxy of C++ HtmlTagHandler class"""

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxPyHtmlTagHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxPyHtmlTagHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):


@@ -359,6 +416,7 @@ class HtmlTagHandlerPtr(HtmlTagHandler):
 _html.HtmlTagHandler_swigregister(HtmlTagHandlerPtr)
 
 class HtmlWinTagHandler(HtmlTagHandler):
 _html.HtmlTagHandler_swigregister(HtmlTagHandlerPtr)
 
 class HtmlWinTagHandler(HtmlTagHandler):

+    """Proxy of C++ HtmlWinTagHandler class"""

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxPyHtmlWinTagHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxPyHtmlWinTagHandler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):


@@ -400,6 +458,7 @@ def HtmlWinParser_AddTagHandler(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 class HtmlSelection(object):
 #---------------------------------------------------------------------------
 
 class HtmlSelection(object):

+    """Proxy of C++ HtmlSelection class"""

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlSelection instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlSelection instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):


@@ -474,6 +533,7 @@ HTML_SEL_OUT = _html.HTML_SEL_OUT
 HTML_SEL_IN = _html.HTML_SEL_IN
 HTML_SEL_CHANGING = _html.HTML_SEL_CHANGING
 class HtmlRenderingState(object):
 HTML_SEL_IN = _html.HTML_SEL_IN
 HTML_SEL_CHANGING = _html.HTML_SEL_CHANGING
 class HtmlRenderingState(object):

+    """Proxy of C++ HtmlRenderingState class"""

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlRenderingState instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlRenderingState instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):


@@ -521,6 +581,7 @@ class HtmlRenderingStatePtr(HtmlRenderingState):
 _html.HtmlRenderingState_swigregister(HtmlRenderingStatePtr)
 
 class HtmlRenderingStyle(object):
 _html.HtmlRenderingState_swigregister(HtmlRenderingStatePtr)
 
 class HtmlRenderingStyle(object):

+    """Proxy of C++ HtmlRenderingStyle class"""

     def __init__(self): raise RuntimeError, "No constructor defined"
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlRenderingStyle instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self): raise RuntimeError, "No constructor defined"
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlRenderingStyle instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)


@@ -541,6 +602,7 @@ class HtmlRenderingStylePtr(HtmlRenderingStyle):
 _html.HtmlRenderingStyle_swigregister(HtmlRenderingStylePtr)
 
 class DefaultHtmlRenderingStyle(HtmlRenderingStyle):
 _html.HtmlRenderingStyle_swigregister(HtmlRenderingStylePtr)
 
 class DefaultHtmlRenderingStyle(HtmlRenderingStyle):

+    """Proxy of C++ DefaultHtmlRenderingStyle class"""

     def __init__(self): raise RuntimeError, "No constructor defined"
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxDefaultHtmlRenderingStyle instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self): raise RuntimeError, "No constructor defined"
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxDefaultHtmlRenderingStyle instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)


@@ -561,6 +623,7 @@ class DefaultHtmlRenderingStylePtr(DefaultHtmlRenderingStyle):
 _html.DefaultHtmlRenderingStyle_swigregister(DefaultHtmlRenderingStylePtr)
 
 class HtmlRenderingInfo(object):
 _html.DefaultHtmlRenderingStyle_swigregister(DefaultHtmlRenderingStylePtr)
 
 class HtmlRenderingInfo(object):

+    """Proxy of C++ HtmlRenderingInfo class"""

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlRenderingInfo instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlRenderingInfo instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):


@@ -609,6 +672,7 @@ HTML_FIND_EXACT = _html.HTML_FIND_EXACT
 HTML_FIND_NEAREST_BEFORE = _html.HTML_FIND_NEAREST_BEFORE
 HTML_FIND_NEAREST_AFTER = _html.HTML_FIND_NEAREST_AFTER
 class HtmlCell(_core.Object):
 HTML_FIND_NEAREST_BEFORE = _html.HTML_FIND_NEAREST_BEFORE
 HTML_FIND_NEAREST_AFTER = _html.HTML_FIND_NEAREST_AFTER
 class HtmlCell(_core.Object):

+    """Proxy of C++ HtmlCell class"""

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlCell instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlCell instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):


@@ -758,6 +822,7 @@ class HtmlCellPtr(HtmlCell):
 _html.HtmlCell_swigregister(HtmlCellPtr)
 
 class HtmlWordCell(HtmlCell):
 _html.HtmlCell_swigregister(HtmlCellPtr)
 
 class HtmlWordCell(HtmlCell):

+    """Proxy of C++ HtmlWordCell class"""

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlWordCell instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlWordCell instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):


@@ -775,6 +840,7 @@ class HtmlWordCellPtr(HtmlWordCell):
 _html.HtmlWordCell_swigregister(HtmlWordCellPtr)
 
 class HtmlContainerCell(HtmlCell):
 _html.HtmlWordCell_swigregister(HtmlWordCellPtr)
 
 class HtmlContainerCell(HtmlCell):

+    """Proxy of C++ HtmlContainerCell class"""

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlContainerCell instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlContainerCell instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):


@@ -856,6 +922,7 @@ class HtmlContainerCellPtr(HtmlContainerCell):
 _html.HtmlContainerCell_swigregister(HtmlContainerCellPtr)
 
 class HtmlColourCell(HtmlCell):
 _html.HtmlContainerCell_swigregister(HtmlContainerCellPtr)
 
 class HtmlColourCell(HtmlCell):

+    """Proxy of C++ HtmlColourCell class"""

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlColourCell instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlColourCell instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):


@@ -873,6 +940,7 @@ class HtmlColourCellPtr(HtmlColourCell):
 _html.HtmlColourCell_swigregister(HtmlColourCellPtr)
 
 class HtmlFontCell(HtmlCell):
 _html.HtmlColourCell_swigregister(HtmlColourCellPtr)
 
 class HtmlFontCell(HtmlCell):

+    """Proxy of C++ HtmlFontCell class"""

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlFontCell instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlFontCell instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):


@@ -890,6 +958,7 @@ class HtmlFontCellPtr(HtmlFontCell):
 _html.HtmlFontCell_swigregister(HtmlFontCellPtr)
 
 class HtmlWidgetCell(HtmlCell):
 _html.HtmlFontCell_swigregister(HtmlFontCellPtr)
 
 class HtmlWidgetCell(HtmlCell):

+    """Proxy of C++ HtmlWidgetCell class"""

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlWidgetCell instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlWidgetCell instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):


@@ -909,6 +978,7 @@ _html.HtmlWidgetCell_swigregister(HtmlWidgetCellPtr)
 #---------------------------------------------------------------------------
 
 class HtmlFilter(_core.Object):
 #---------------------------------------------------------------------------
 
 class HtmlFilter(_core.Object):

+    """Proxy of C++ HtmlFilter class"""

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxPyHtmlFilter instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxPyHtmlFilter instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):


@@ -934,6 +1004,7 @@ _html.HtmlFilter_swigregister(HtmlFilterPtr)
 #---------------------------------------------------------------------------
 
 class HtmlWindow(_windows.ScrolledWindow):
 #---------------------------------------------------------------------------
 
 class HtmlWindow(_windows.ScrolledWindow):

+    """Proxy of C++ HtmlWindow class"""

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxPyHtmlWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxPyHtmlWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):


@@ -1004,14 +1075,22 @@ class HtmlWindow(_windows.ScrolledWindow):
         """SetFonts(self, String normal_face, String fixed_face, PyObject sizes=None)"""
         return _html.HtmlWindow_SetFonts(*args, **kwargs)
 
         """SetFonts(self, String normal_face, String fixed_face, PyObject sizes=None)"""
         return _html.HtmlWindow_SetFonts(*args, **kwargs)
 

-    def SetTitle(*args, **kwargs):
-        """SetTitle(self, String title)"""
-        return _html.HtmlWindow_SetTitle(*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 SetLabel(*args, **kwargs):
+        """SetLabel(self, String title)"""
+        return _html.HtmlWindow_SetLabel(*args, **kwargs)

 
     def SetBorders(*args, **kwargs):
         """SetBorders(self, int b)"""
         return _html.HtmlWindow_SetBorders(*args, **kwargs)
 
 
     def SetBorders(*args, **kwargs):
         """SetBorders(self, int b)"""
         return _html.HtmlWindow_SetBorders(*args, **kwargs)
 

+    def SetBackgroundImage(*args, **kwargs):
+        """SetBackgroundImage(self, Bitmap bmpBg)"""
+        return _html.HtmlWindow_SetBackgroundImage(*args, **kwargs)
+

     def ReadCustomization(*args, **kwargs):
         """ReadCustomization(self, ConfigBase cfg, String path=EmptyString)"""
         return _html.HtmlWindow_ReadCustomization(*args, **kwargs)
     def ReadCustomization(*args, **kwargs):
         """ReadCustomization(self, ConfigBase cfg, String path=EmptyString)"""
         return _html.HtmlWindow_ReadCustomization(*args, **kwargs)


@@ -1073,21 +1152,49 @@ class HtmlWindow(_windows.ScrolledWindow):
         """SelectAll(self)"""
         return _html.HtmlWindow_SelectAll(*args, **kwargs)
 
         """SelectAll(self)"""
         return _html.HtmlWindow_SelectAll(*args, **kwargs)
 

-    def base_OnLinkClicked(*args, **kwargs):
-        """base_OnLinkClicked(self, HtmlLinkInfo link)"""
-        return _html.HtmlWindow_base_OnLinkClicked(*args, **kwargs)
+    def SelectionToText(*args, **kwargs):
+        """SelectionToText(self) -> String"""
+        return _html.HtmlWindow_SelectionToText(*args, **kwargs)
+
+    def ToText(*args, **kwargs):
+        """ToText(self) -> String"""
+        return _html.HtmlWindow_ToText(*args, **kwargs)
+
+    def OnLinkClicked(*args, **kwargs):
+        """OnLinkClicked(self, HtmlLinkInfo link)"""
+        return _html.HtmlWindow_OnLinkClicked(*args, **kwargs)
+
+    def OnSetTitle(*args, **kwargs):
+        """OnSetTitle(self, String title)"""
+        return _html.HtmlWindow_OnSetTitle(*args, **kwargs)
+
+    def OnCellMouseHover(*args, **kwargs):
+        """OnCellMouseHover(self, HtmlCell cell, int x, int y)"""
+        return _html.HtmlWindow_OnCellMouseHover(*args, **kwargs)
+
+    def OnCellClicked(*args, **kwargs):
+        """OnCellClicked(self, HtmlCell cell, int x, int y, MouseEvent event)"""
+        return _html.HtmlWindow_OnCellClicked(*args, **kwargs)

 
 

-    def base_OnSetTitle(*args, **kwargs):
-        """base_OnSetTitle(self, String title)"""
-        return _html.HtmlWindow_base_OnSetTitle(*args, **kwargs)
+    def base_OnLinkClicked(*args, **kw):
+        return HtmlWindow.OnLinkClicked(*args, **kw)
+    base_OnLinkClicked = wx._deprecated(base_OnLinkClicked,
+                                   "Please use HtmlWindow.OnLinkClicked instead.")

 
 

-    def base_OnCellMouseHover(*args, **kwargs):
-        """base_OnCellMouseHover(self, HtmlCell cell, int x, int y)"""
-        return _html.HtmlWindow_base_OnCellMouseHover(*args, **kwargs)
+    def base_OnSetTitle(*args, **kw):
+        return HtmlWindow.OnSetTitle(*args, **kw)
+    base_OnSetTitle = wx._deprecated(base_OnSetTitle,
+                                   "Please use HtmlWindow.OnSetTitle instead.")

 
 

-    def base_OnCellClicked(*args, **kwargs):
-        """base_OnCellClicked(self, HtmlCell cell, int x, int y, MouseEvent event)"""
-        return _html.HtmlWindow_base_OnCellClicked(*args, **kwargs)
+    def base_OnCellMouseHover(*args, **kw):
+        return HtmlWindow.OnCellMouseHover(*args, **kw)
+    base_OnCellMouseHover = wx._deprecated(base_OnCellMouseHover,
+                                   "Please use HtmlWindow.OnCellMouseHover instead.")
+
+    def base_OnCellClicked(*args, **kw):
+        return HtmlWindow.OnCellClicked(*args, **kw)
+    base_OnCellClicked = wx._deprecated(base_OnCellClicked,
+                                   "Please use HtmlWindow.OnCellClicked instead.")

 
     def GetClassDefaultAttributes(*args, **kwargs):
         """
 
     def GetClassDefaultAttributes(*args, **kwargs):
         """


@@ -1096,12 +1203,13 @@ class HtmlWindow(_windows.ScrolledWindow):
         Get the default attributes for this class.  This is useful if you want
         to use the same font or colour in your own control as in a standard
         control -- which is a much better idea than hard coding specific
         Get the default attributes for this class.  This is useful if you want
         to use the same font or colour in your own control as in a standard
         control -- which is a much better idea than hard coding specific

-        colours or fonts which might look completely out of place on the users
-        system, especially if it uses themes.
+        colours or fonts which might look completely out of place on the
+        user's system, especially if it uses themes.

 
         The variant parameter is only relevant under Mac currently and is
         ignore under other platforms. Under Mac, it will change the size of
 
         The variant parameter is only relevant under Mac currently and is
         ignore under other platforms. Under Mac, it will change the size of

-        the returned font. See SetWindowVariant for more about this.
+        the returned font. See `wx.Window.SetWindowVariant` for more about
+        this.

         """
         return _html.HtmlWindow_GetClassDefaultAttributes(*args, **kwargs)
 
         """
         return _html.HtmlWindow_GetClassDefaultAttributes(*args, **kwargs)
 


@@ -1131,18 +1239,20 @@ def HtmlWindow_GetClassDefaultAttributes(*args, **kwargs):
     Get the default attributes for this class.  This is useful if you want
     to use the same font or colour in your own control as in a standard
     control -- which is a much better idea than hard coding specific
     Get the default attributes for this class.  This is useful if you want
     to use the same font or colour in your own control as in a standard
     control -- which is a much better idea than hard coding specific

-    colours or fonts which might look completely out of place on the users
-    system, especially if it uses themes.
+    colours or fonts which might look completely out of place on the
+    user's system, especially if it uses themes.

 
     The variant parameter is only relevant under Mac currently and is
     ignore under other platforms. Under Mac, it will change the size of
 
     The variant parameter is only relevant under Mac currently and is
     ignore under other platforms. Under Mac, it will change the size of

-    the returned font. See SetWindowVariant for more about this.
+    the returned font. See `wx.Window.SetWindowVariant` for more about
+    this.

     """
     return _html.HtmlWindow_GetClassDefaultAttributes(*args, **kwargs)
 
 #---------------------------------------------------------------------------
 
 class HtmlDCRenderer(_core.Object):
     """
     return _html.HtmlWindow_GetClassDefaultAttributes(*args, **kwargs)
 
 #---------------------------------------------------------------------------
 
 class HtmlDCRenderer(_core.Object):

+    """Proxy of C++ HtmlDCRenderer class"""

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlDCRenderer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlDCRenderer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):


@@ -1173,9 +1283,13 @@ class HtmlDCRenderer(_core.Object):
         """SetFonts(self, String normal_face, String fixed_face, PyObject sizes=None)"""
         return _html.HtmlDCRenderer_SetFonts(*args, **kwargs)
 
         """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):
         """
     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)
             int choices=None, int LCOUNT=0) -> int
         """
         return _html.HtmlDCRenderer_Render(*args, **kwargs)


@@ -1196,6 +1310,7 @@ PAGE_ODD = _html.PAGE_ODD
 PAGE_EVEN = _html.PAGE_EVEN
 PAGE_ALL = _html.PAGE_ALL
 class HtmlPrintout(_windows.Printout):
 PAGE_EVEN = _html.PAGE_EVEN
 PAGE_ALL = _html.PAGE_ALL
 class HtmlPrintout(_windows.Printout):

+    """Proxy of C++ HtmlPrintout class"""

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlPrintout instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlPrintout instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):


@@ -1224,6 +1339,10 @@ class HtmlPrintout(_windows.Printout):
         """SetFonts(self, String normal_face, String fixed_face, PyObject sizes=None)"""
         return _html.HtmlPrintout_SetFonts(*args, **kwargs)
 
         """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, 
     def SetMargins(*args, **kwargs):
         """
         SetMargins(self, float top=25.2, float bottom=25.2, float left=25.2, 


@@ -1258,6 +1377,7 @@ def HtmlPrintout_CleanUpStatics(*args, **kwargs):
     return _html.HtmlPrintout_CleanUpStatics(*args, **kwargs)
 
 class HtmlEasyPrinting(_core.Object):
     return _html.HtmlPrintout_CleanUpStatics(*args, **kwargs)
 
 class HtmlEasyPrinting(_core.Object):

+    """Proxy of C++ HtmlEasyPrinting class"""

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlEasyPrinting instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlEasyPrinting instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):


@@ -1288,10 +1408,6 @@ class HtmlEasyPrinting(_core.Object):
         """PrintText(self, String htmltext, String basepath=EmptyString)"""
         return _html.HtmlEasyPrinting_PrintText(*args, **kwargs)
 
         """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)
     def PageSetup(*args, **kwargs):
         """PageSetup(self)"""
         return _html.HtmlEasyPrinting_PageSetup(*args, **kwargs)


@@ -1308,6 +1424,10 @@ class HtmlEasyPrinting(_core.Object):
         """SetFonts(self, String normal_face, String fixed_face, PyObject sizes=None)"""
         return _html.HtmlEasyPrinting_SetFonts(*args, **kwargs)
 
         """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)
     def GetPrintData(*args, **kwargs):
         """GetPrintData(self) -> PrintData"""
         return _html.HtmlEasyPrinting_GetPrintData(*args, **kwargs)


@@ -1327,6 +1447,7 @@ _html.HtmlEasyPrinting_swigregister(HtmlEasyPrintingPtr)
 #---------------------------------------------------------------------------
 
 class HtmlBookRecord(object):
 #---------------------------------------------------------------------------
 
 class HtmlBookRecord(object):

+    """Proxy of C++ HtmlBookRecord class"""

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlBookRecord instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlBookRecord instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):


@@ -1387,39 +1508,8 @@ class HtmlBookRecordPtr(HtmlBookRecord):
         self.__class__ = HtmlBookRecord
 _html.HtmlBookRecord_swigregister(HtmlBookRecordPtr)
 
         self.__class__ = HtmlBookRecord
 _html.HtmlBookRecord_swigregister(HtmlBookRecordPtr)
 

-class HtmlContentsItem(object):
-    def __init__(self): raise RuntimeError, "No constructor defined"
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxHtmlContentsItem instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def GetLevel(*args, **kwargs):
-        """GetLevel(self) -> int"""
-        return _html.HtmlContentsItem_GetLevel(*args, **kwargs)
-
-    def GetID(*args, **kwargs):
-        """GetID(self) -> int"""
-        return _html.HtmlContentsItem_GetID(*args, **kwargs)
-
-    def GetName(*args, **kwargs):
-        """GetName(self) -> String"""
-        return _html.HtmlContentsItem_GetName(*args, **kwargs)
-
-    def GetPage(*args, **kwargs):
-        """GetPage(self) -> String"""
-        return _html.HtmlContentsItem_GetPage(*args, **kwargs)
-
-    def GetBook(*args, **kwargs):
-        """GetBook(self) -> HtmlBookRecord"""
-        return _html.HtmlContentsItem_GetBook(*args, **kwargs)
-
-
-class HtmlContentsItemPtr(HtmlContentsItem):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = HtmlContentsItem
-_html.HtmlContentsItem_swigregister(HtmlContentsItemPtr)
-

 class HtmlSearchStatus(object):
 class HtmlSearchStatus(object):

+    """Proxy of C++ HtmlSearchStatus class"""

     def __init__(self): raise RuntimeError, "No constructor defined"
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlSearchStatus instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self): raise RuntimeError, "No constructor defined"
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlSearchStatus instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)


@@ -1443,10 +1533,6 @@ class HtmlSearchStatus(object):
         """GetName(self) -> String"""
         return _html.HtmlSearchStatus_GetName(*args, **kwargs)
 
         """GetName(self) -> String"""
         return _html.HtmlSearchStatus_GetName(*args, **kwargs)
 

-    def GetContentsItem(*args, **kwargs):
-        """GetContentsItem(self) -> HtmlContentsItem"""
-        return _html.HtmlSearchStatus_GetContentsItem(*args, **kwargs)
-

 
 class HtmlSearchStatusPtr(HtmlSearchStatus):
     def __init__(self, this):
 
 class HtmlSearchStatusPtr(HtmlSearchStatus):
     def __init__(self, this):


@@ -1456,6 +1542,7 @@ class HtmlSearchStatusPtr(HtmlSearchStatus):
 _html.HtmlSearchStatus_swigregister(HtmlSearchStatusPtr)
 
 class HtmlHelpData(object):
 _html.HtmlSearchStatus_swigregister(HtmlSearchStatusPtr)
 
 class HtmlHelpData(object):

+    """Proxy of C++ HtmlHelpData class"""

     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlHelpData instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlHelpData instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):


@@ -1490,22 +1577,6 @@ class HtmlHelpData(object):
         """GetBookRecArray(self) -> wxHtmlBookRecArray"""
         return _html.HtmlHelpData_GetBookRecArray(*args, **kwargs)
 
         """GetBookRecArray(self) -> wxHtmlBookRecArray"""
         return _html.HtmlHelpData_GetBookRecArray(*args, **kwargs)
 

-    def GetContents(*args, **kwargs):
-        """GetContents(self) -> HtmlContentsItem"""
-        return _html.HtmlHelpData_GetContents(*args, **kwargs)
-
-    def GetContentsCnt(*args, **kwargs):
-        """GetContentsCnt(self) -> int"""
-        return _html.HtmlHelpData_GetContentsCnt(*args, **kwargs)
-
-    def GetIndex(*args, **kwargs):
-        """GetIndex(self) -> HtmlContentsItem"""
-        return _html.HtmlHelpData_GetIndex(*args, **kwargs)
-
-    def GetIndexCnt(*args, **kwargs):
-        """GetIndexCnt(self) -> int"""
-        return _html.HtmlHelpData_GetIndexCnt(*args, **kwargs)
-

 
 class HtmlHelpDataPtr(HtmlHelpData):
     def __init__(self, this):
 
 class HtmlHelpDataPtr(HtmlHelpData):
     def __init__(self, this):


@@ -1514,59 +1585,248 @@ class HtmlHelpDataPtr(HtmlHelpData):
         self.__class__ = HtmlHelpData
 _html.HtmlHelpData_swigregister(HtmlHelpDataPtr)
 
         self.__class__ = HtmlHelpData
 _html.HtmlHelpData_swigregister(HtmlHelpDataPtr)
 

-class HtmlHelpFrame(_windows.Frame):
+HF_TOOLBAR = _html.HF_TOOLBAR
+HF_CONTENTS = _html.HF_CONTENTS
+HF_INDEX = _html.HF_INDEX
+HF_SEARCH = _html.HF_SEARCH
+HF_BOOKMARKS = _html.HF_BOOKMARKS
+HF_OPEN_FILES = _html.HF_OPEN_FILES
+HF_PRINT = _html.HF_PRINT
+HF_FLAT_TOOLBAR = _html.HF_FLAT_TOOLBAR
+HF_MERGE_BOOKS = _html.HF_MERGE_BOOKS
+HF_ICONS_BOOK = _html.HF_ICONS_BOOK
+HF_ICONS_BOOK_CHAPTER = _html.HF_ICONS_BOOK_CHAPTER
+HF_ICONS_FOLDER = _html.HF_ICONS_FOLDER
+HF_DEFAULT_STYLE = _html.HF_DEFAULT_STYLE
+HF_EMBEDDED = _html.HF_EMBEDDED
+HF_DIALOG = _html.HF_DIALOG
+HF_FRAME = _html.HF_FRAME
+HF_MODAL = _html.HF_MODAL
+ID_HTML_PANEL = _html.ID_HTML_PANEL
+ID_HTML_BACK = _html.ID_HTML_BACK
+ID_HTML_FORWARD = _html.ID_HTML_FORWARD
+ID_HTML_UPNODE = _html.ID_HTML_UPNODE
+ID_HTML_UP = _html.ID_HTML_UP
+ID_HTML_DOWN = _html.ID_HTML_DOWN
+ID_HTML_PRINT = _html.ID_HTML_PRINT
+ID_HTML_OPENFILE = _html.ID_HTML_OPENFILE
+ID_HTML_OPTIONS = _html.ID_HTML_OPTIONS
+ID_HTML_BOOKMARKSLIST = _html.ID_HTML_BOOKMARKSLIST
+ID_HTML_BOOKMARKSADD = _html.ID_HTML_BOOKMARKSADD
+ID_HTML_BOOKMARKSREMOVE = _html.ID_HTML_BOOKMARKSREMOVE
+ID_HTML_TREECTRL = _html.ID_HTML_TREECTRL
+ID_HTML_INDEXPAGE = _html.ID_HTML_INDEXPAGE
+ID_HTML_INDEXLIST = _html.ID_HTML_INDEXLIST
+ID_HTML_INDEXTEXT = _html.ID_HTML_INDEXTEXT
+ID_HTML_INDEXBUTTON = _html.ID_HTML_INDEXBUTTON
+ID_HTML_INDEXBUTTONALL = _html.ID_HTML_INDEXBUTTONALL
+ID_HTML_NOTEBOOK = _html.ID_HTML_NOTEBOOK
+ID_HTML_SEARCHPAGE = _html.ID_HTML_SEARCHPAGE
+ID_HTML_SEARCHTEXT = _html.ID_HTML_SEARCHTEXT
+ID_HTML_SEARCHLIST = _html.ID_HTML_SEARCHLIST
+ID_HTML_SEARCHBUTTON = _html.ID_HTML_SEARCHBUTTON
+ID_HTML_SEARCHCHOICE = _html.ID_HTML_SEARCHCHOICE
+ID_HTML_COUNTINFO = _html.ID_HTML_COUNTINFO
+class HtmlHelpWindow(_core.Window):
+    """Proxy of C++ HtmlHelpWindow class"""

     def __repr__(self):
     def __repr__(self):

-        return "<%s.%s; proxy of C++ wxHtmlHelpFrame instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+        return "<%s.%s; proxy of C++ wxHtmlHelpWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

     def __init__(self, *args, **kwargs):
         """
     def __init__(self, *args, **kwargs):
         """

-        __init__(self, Window parent, int ??, String title=EmptyString, int style=HF_DEFAULTSTYLE, 
-            HtmlHelpData data=None) -> HtmlHelpFrame
+        __init__(self, Window parent, int ??, Point pos=DefaultPosition, Size size=DefaultSize, 
+            int style=wxTAB_TRAVERSAL|wxNO_BORDER, 
+            int helpStyle=HF_DEFAULT_STYLE, 
+            HtmlHelpData data=None) -> HtmlHelpWindow

         """
         """

-        newobj = _html.new_HtmlHelpFrame(*args, **kwargs)
+        newobj = _html.new_HtmlHelpWindow(*args, **kwargs)

         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
 
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
 

+    def Create(*args, **kwargs):
+        """
+        Create(self, Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+            int style=wxTAB_TRAVERSAL|wxNO_BORDER, 
+            int helpStyle=HF_DEFAULT_STYLE) -> bool
+        """
+        return _html.HtmlHelpWindow_Create(*args, **kwargs)
+

     def GetData(*args, **kwargs):
         """GetData(self) -> HtmlHelpData"""
     def GetData(*args, **kwargs):
         """GetData(self) -> HtmlHelpData"""

-        return _html.HtmlHelpFrame_GetData(*args, **kwargs)
+        return _html.HtmlHelpWindow_GetData(*args, **kwargs)

 
 

-    def SetTitleFormat(*args, **kwargs):
-        """SetTitleFormat(self, String format)"""
-        return _html.HtmlHelpFrame_SetTitleFormat(*args, **kwargs)
+    def GetController(*args, **kwargs):
+        """GetController(self) -> HtmlHelpController"""
+        return _html.HtmlHelpWindow_GetController(*args, **kwargs)
+
+    def SetController(*args, **kwargs):
+        """SetController(self, HtmlHelpController controller)"""
+        return _html.HtmlHelpWindow_SetController(*args, **kwargs)

 
     def Display(*args, **kwargs):
 
     def Display(*args, **kwargs):

-        """Display(self, String x)"""
-        return _html.HtmlHelpFrame_Display(*args, **kwargs)
+        """Display(self, String x) -> bool"""
+        return _html.HtmlHelpWindow_Display(*args, **kwargs)

 
     def DisplayID(*args, **kwargs):
 
     def DisplayID(*args, **kwargs):

-        """DisplayID(self, int id)"""
-        return _html.HtmlHelpFrame_DisplayID(*args, **kwargs)
+        """DisplayID(self, int id) -> bool"""
+        return _html.HtmlHelpWindow_DisplayID(*args, **kwargs)

 
     def DisplayContents(*args, **kwargs):
 
     def DisplayContents(*args, **kwargs):

-        """DisplayContents(self)"""
-        return _html.HtmlHelpFrame_DisplayContents(*args, **kwargs)
+        """DisplayContents(self) -> bool"""
+        return _html.HtmlHelpWindow_DisplayContents(*args, **kwargs)

 
     def DisplayIndex(*args, **kwargs):
 
     def DisplayIndex(*args, **kwargs):

-        """DisplayIndex(self)"""
-        return _html.HtmlHelpFrame_DisplayIndex(*args, **kwargs)
+        """DisplayIndex(self) -> bool"""
+        return _html.HtmlHelpWindow_DisplayIndex(*args, **kwargs)

 
     def KeywordSearch(*args, **kwargs):
 
     def KeywordSearch(*args, **kwargs):

-        """KeywordSearch(self, String keyword) -> bool"""
-        return _html.HtmlHelpFrame_KeywordSearch(*args, **kwargs)
+        """KeywordSearch(self, String keyword, wxHelpSearchMode mode=wxHELP_SEARCH_ALL) -> bool"""
+        return _html.HtmlHelpWindow_KeywordSearch(*args, **kwargs)

 
     def UseConfig(*args, **kwargs):
 
     def UseConfig(*args, **kwargs):

-        """UseConfig(self, ConfigBase config, String rootpath=EmptyString)"""
-        return _html.HtmlHelpFrame_UseConfig(*args, **kwargs)
+        """UseConfig(self, ConfigBase config, String rootpath=wxEmptyString)"""
+        return _html.HtmlHelpWindow_UseConfig(*args, **kwargs)

 
     def ReadCustomization(*args, **kwargs):
 
     def ReadCustomization(*args, **kwargs):

-        """ReadCustomization(self, ConfigBase cfg, String path=EmptyString)"""
-        return _html.HtmlHelpFrame_ReadCustomization(*args, **kwargs)
+        """ReadCustomization(self, ConfigBase cfg, String path=wxEmptyString)"""
+        return _html.HtmlHelpWindow_ReadCustomization(*args, **kwargs)

 
     def WriteCustomization(*args, **kwargs):
 
     def WriteCustomization(*args, **kwargs):

-        """WriteCustomization(self, ConfigBase cfg, String path=EmptyString)"""
-        return _html.HtmlHelpFrame_WriteCustomization(*args, **kwargs)
+        """WriteCustomization(self, ConfigBase cfg, String path=wxEmptyString)"""
+        return _html.HtmlHelpWindow_WriteCustomization(*args, **kwargs)
+
+    def NotifyPageChanged(*args, **kwargs):
+        """NotifyPageChanged(self)"""
+        return _html.HtmlHelpWindow_NotifyPageChanged(*args, **kwargs)
+
+    def RefreshLists(*args, **kwargs):
+        """RefreshLists(self)"""
+        return _html.HtmlHelpWindow_RefreshLists(*args, **kwargs)
+
+    def GetHtmlWindow(*args, **kwargs):
+        """GetHtmlWindow(self) -> wxHtmlWindow"""
+        return _html.HtmlHelpWindow_GetHtmlWindow(*args, **kwargs)
+
+    def GetSplitterWindow(*args, **kwargs):
+        """GetSplitterWindow(self) -> SplitterWindow"""
+        return _html.HtmlHelpWindow_GetSplitterWindow(*args, **kwargs)
+
+    def GetToolBar(*args, **kwargs):
+        """GetToolBar(self) -> wxToolBar"""
+        return _html.HtmlHelpWindow_GetToolBar(*args, **kwargs)
+
+    def GetCfgData(*args, **kwargs):
+        """GetCfgData(self) -> wxHtmlHelpFrameCfg"""
+        return _html.HtmlHelpWindow_GetCfgData(*args, **kwargs)
+
+    def GetTreeCtrl(*args, **kwargs):
+        """GetTreeCtrl(self) -> wxTreeCtrl"""
+        return _html.HtmlHelpWindow_GetTreeCtrl(*args, **kwargs)
+
+
+class HtmlHelpWindowPtr(HtmlHelpWindow):
+    def __init__(self, this):
+        self.this = this
+        if not hasattr(self,"thisown"): self.thisown = 0
+        self.__class__ = HtmlHelpWindow
+_html.HtmlHelpWindow_swigregister(HtmlHelpWindowPtr)
+
+def PreHtmlHelpWindow(*args, **kwargs):
+    """PreHtmlHelpWindow(HtmlHelpData data=None) -> HtmlHelpWindow"""
+    val = _html.new_PreHtmlHelpWindow(*args, **kwargs)
+    val.thisown = 1
+    self._setOORInfo(self)
+    return val
+
+class HtmlWindowEvent(_core.NotifyEvent):
+    """Proxy of C++ HtmlWindowEvent class"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxHtmlWindowEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def __init__(self, *args, **kwargs):
+        """__init__(self, wxEventType commandType=wxEVT_NULL, int id=0) -> HtmlWindowEvent"""
+        newobj = _html.new_HtmlWindowEvent(*args, **kwargs)
+        self.this = newobj.this
+        self.thisown = 1
+        del newobj.thisown
+    def SetURL(*args, **kwargs):
+        """SetURL(self, String url)"""
+        return _html.HtmlWindowEvent_SetURL(*args, **kwargs)
+
+    def GetURL(*args, **kwargs):
+        """GetURL(self) -> String"""
+        return _html.HtmlWindowEvent_GetURL(*args, **kwargs)
+
+
+class HtmlWindowEventPtr(HtmlWindowEvent):
+    def __init__(self, this):
+        self.this = this
+        if not hasattr(self,"thisown"): self.thisown = 0
+        self.__class__ = HtmlWindowEvent
+_html.HtmlWindowEvent_swigregister(HtmlWindowEventPtr)
+
+class HtmlHelpFrame(_windows.Frame):
+    """Proxy of C++ HtmlHelpFrame class"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxHtmlHelpFrame instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def __init__(self, *args, **kwargs):
+        """
+        __init__(self, Window parent, int ??, String title=EmptyString, int style=wxHF_DEFAULTSTYLE, 
+            HtmlHelpData data=None) -> HtmlHelpFrame
+        """
+        newobj = _html.new_HtmlHelpFrame(*args, **kwargs)
+        self.this = newobj.this
+        self.thisown = 1
+        del newobj.thisown
+        self._setOORInfo(self)
+
+    def Create(*args, **kwargs):
+        """Create(self, Window parent, int id, String title=EmptyString, int style=HF_DEFAULT_STYLE) -> bool"""
+        return _html.HtmlHelpFrame_Create(*args, **kwargs)
+
+    def GetData(*args, **kwargs):
+        """GetData(self) -> HtmlHelpData"""
+        return _html.HtmlHelpFrame_GetData(*args, **kwargs)
+
+    def SetTitleFormat(*args, **kwargs):
+        """SetTitleFormat(self, String format)"""
+        return _html.HtmlHelpFrame_SetTitleFormat(*args, **kwargs)
+
+    def AddGrabIfNeeded(*args, **kwargs):
+        """AddGrabIfNeeded(self)"""
+        return _html.HtmlHelpFrame_AddGrabIfNeeded(*args, **kwargs)
+
+    def GetController(*args, **kwargs):
+        """GetController(self) -> HtmlHelpController"""
+        return _html.HtmlHelpFrame_GetController(*args, **kwargs)
+
+    def SetController(*args, **kwargs):
+        """SetController(self, HtmlHelpController controller)"""
+        return _html.HtmlHelpFrame_SetController(*args, **kwargs)
+
+    def GetHelpWindow(*args, **kwargs):
+        """GetHelpWindow(self) -> HtmlHelpWindow"""
+        return _html.HtmlHelpFrame_GetHelpWindow(*args, **kwargs)
+
+    # For compatibility from before the refactor
+    def Display(self, x):
+        return self.GetHelpWindow().Display(x)
+    def DisplayID(self, x):
+        return self.GetHelpWindow().DisplayID(id)
+    def DisplayContents(self):
+        return self.GetHelpWindow().DisplayContents()
+    def DisplayIndex(self):
+        return self.GetHelpWindow().DisplayIndex()
+
+    def KeywordSearch(self, keyword):
+        return self.GetHelpWindow().KeywordSearch(keyword)
+         
+    def UseConfig(self, config, rootpath=""):
+        return self.GetHelpWindow().UseConfig(config, rootpath)
+    def ReadCustomization(self, config, rootpath=""):
+        return self.GetHelpWindow().ReadCustomization(config, rootpath)
+    def WriteCustomization(self, config, rootpath=""):
+        return self.GetHelpWindow().WriteCustomization(config, rootpath)

 
 
 class HtmlHelpFramePtr(HtmlHelpFrame):
 
 
 class HtmlHelpFramePtr(HtmlHelpFrame):


@@ -1576,32 +1836,181 @@ class HtmlHelpFramePtr(HtmlHelpFrame):
         self.__class__ = HtmlHelpFrame
 _html.HtmlHelpFrame_swigregister(HtmlHelpFramePtr)
 
         self.__class__ = HtmlHelpFrame
 _html.HtmlHelpFrame_swigregister(HtmlHelpFramePtr)
 

-HF_TOOLBAR = _html.HF_TOOLBAR
-HF_FLATTOOLBAR = _html.HF_FLATTOOLBAR
-HF_CONTENTS = _html.HF_CONTENTS
-HF_INDEX = _html.HF_INDEX
-HF_SEARCH = _html.HF_SEARCH
-HF_BOOKMARKS = _html.HF_BOOKMARKS
-HF_OPENFILES = _html.HF_OPENFILES
-HF_PRINT = _html.HF_PRINT
-HF_DEFAULTSTYLE = _html.HF_DEFAULTSTYLE
-class HtmlHelpController(_core.EvtHandler):
+def PreHtmlHelpFrame(*args, **kwargs):
+    """PreHtmlHelpFrame(HtmlHelpData data=None) -> HtmlHelpFrame"""
+    val = _html.new_PreHtmlHelpFrame(*args, **kwargs)
+    val.thisown = 1
+    self._setOORInfo(self)
+    return val
+
+class HtmlHelpDialog(_windows.Dialog):
+    """Proxy of C++ HtmlHelpDialog class"""

     def __repr__(self):
     def __repr__(self):

-        return "<%s.%s; proxy of C++ wxHtmlHelpController instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+        return "<%s.%s; proxy of C++ wxHtmlHelpDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)

     def __init__(self, *args, **kwargs):
     def __init__(self, *args, **kwargs):

-        """__init__(self, int style=HF_DEFAULTSTYLE) -> HtmlHelpController"""
-        newobj = _html.new_HtmlHelpController(*args, **kwargs)
+        """
+        __init__(self, Window parent, int ??, String title=EmptyString, int style=HF_DEFAULT_STYLE, 
+            HtmlHelpData data=None) -> HtmlHelpDialog
+        """
+        newobj = _html.new_HtmlHelpDialog(*args, **kwargs)

         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
 
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self._setOORInfo(self)
 

+    def Create(*args, **kwargs):
+        """Create(self, Window parent, int id, String title=EmptyString, int style=HF_DEFAULT_STYLE) -> bool"""
+        return _html.HtmlHelpDialog_Create(*args, **kwargs)
+
+    def GetData(*args, **kwargs):
+        """GetData(self) -> HtmlHelpData"""
+        return _html.HtmlHelpDialog_GetData(*args, **kwargs)
+
+    def GetController(*args, **kwargs):
+        """GetController(self) -> HtmlHelpController"""
+        return _html.HtmlHelpDialog_GetController(*args, **kwargs)
+
+    def SetController(*args, **kwargs):
+        """SetController(self, HtmlHelpController controller)"""
+        return _html.HtmlHelpDialog_SetController(*args, **kwargs)
+
+    def GetHelpWindow(*args, **kwargs):
+        """GetHelpWindow(self) -> HtmlHelpWindow"""
+        return _html.HtmlHelpDialog_GetHelpWindow(*args, **kwargs)
+
+    def SetTitleFormat(*args, **kwargs):
+        """SetTitleFormat(self, String format)"""
+        return _html.HtmlHelpDialog_SetTitleFormat(*args, **kwargs)
+
+
+class HtmlHelpDialogPtr(HtmlHelpDialog):
+    def __init__(self, this):
+        self.this = this
+        if not hasattr(self,"thisown"): self.thisown = 0
+        self.__class__ = HtmlHelpDialog
+_html.HtmlHelpDialog_swigregister(HtmlHelpDialogPtr)
+
+def PreHtmlHelpDialog(*args, **kwargs):
+    """PreHtmlHelpDialog(HtmlHelpData data=None) -> HtmlHelpDialog"""
+    val = _html.new_PreHtmlHelpDialog(*args, **kwargs)
+    val.thisown = 1
+    self._setOORInfo(self)
+    return val
+
+class HelpControllerBase(_core.Object):
+    """Proxy of C++ HelpControllerBase class"""
+    def __init__(self): raise RuntimeError, "No constructor defined"
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxHelpControllerBase instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def Initialize(*args):
+        """
+        Initialize(self, String file, int server) -> bool
+        Initialize(self, String file) -> bool
+        """
+        return _html.HelpControllerBase_Initialize(*args)
+
+    def SetViewer(*args, **kwargs):
+        """SetViewer(self, String viewer, long flags=0)"""
+        return _html.HelpControllerBase_SetViewer(*args, **kwargs)
+
+    def LoadFile(*args, **kwargs):
+        """LoadFile(self, String file=wxEmptyString) -> bool"""
+        return _html.HelpControllerBase_LoadFile(*args, **kwargs)
+
+    def DisplayContents(*args, **kwargs):
+        """DisplayContents(self) -> bool"""
+        return _html.HelpControllerBase_DisplayContents(*args, **kwargs)
+
+    def DisplayContextPopup(*args, **kwargs):
+        """DisplayContextPopup(self, int contextId) -> bool"""
+        return _html.HelpControllerBase_DisplayContextPopup(*args, **kwargs)
+
+    def DisplayTextPopup(*args, **kwargs):
+        """DisplayTextPopup(self, String text, Point pos) -> bool"""
+        return _html.HelpControllerBase_DisplayTextPopup(*args, **kwargs)
+
+    def DisplaySection(*args):
+        """
+        DisplaySection(self, int sectionNo) -> bool
+        DisplaySection(self, String section) -> bool
+        """
+        return _html.HelpControllerBase_DisplaySection(*args)
+
+    def DisplayBlock(*args, **kwargs):
+        """DisplayBlock(self, long blockNo) -> bool"""
+        return _html.HelpControllerBase_DisplayBlock(*args, **kwargs)
+
+    def KeywordSearch(*args, **kwargs):
+        """KeywordSearch(self, String k, wxHelpSearchMode mode=wxHELP_SEARCH_ALL) -> bool"""
+        return _html.HelpControllerBase_KeywordSearch(*args, **kwargs)
+
+    def SetFrameParameters(*args, **kwargs):
+        """
+        SetFrameParameters(self, String title, Size size, Point pos=DefaultPosition, 
+            bool newFrameEachTime=False)
+        """
+        return _html.HelpControllerBase_SetFrameParameters(*args, **kwargs)
+
+    def GetFrameParameters(*args, **kwargs):
+        """GetFrameParameters(self, Size size=None, Point pos=None, bool newFrameEachTime=None) -> Frame"""
+        return _html.HelpControllerBase_GetFrameParameters(*args, **kwargs)
+
+    def Quit(*args, **kwargs):
+        """Quit(self) -> bool"""
+        return _html.HelpControllerBase_Quit(*args, **kwargs)
+
+    def OnQuit(*args, **kwargs):
+        """OnQuit(self)"""
+        return _html.HelpControllerBase_OnQuit(*args, **kwargs)
+
+    def SetParentWindow(*args, **kwargs):
+        """SetParentWindow(self, Window win)"""
+        return _html.HelpControllerBase_SetParentWindow(*args, **kwargs)
+
+    def GetParentWindow(*args, **kwargs):
+        """GetParentWindow(self) -> Window"""
+        return _html.HelpControllerBase_GetParentWindow(*args, **kwargs)
+
+
+class HelpControllerBasePtr(HelpControllerBase):
+    def __init__(self, this):
+        self.this = this
+        if not hasattr(self,"thisown"): self.thisown = 0
+        self.__class__ = HelpControllerBase
+_html.HelpControllerBase_swigregister(HelpControllerBasePtr)
+
+class HtmlHelpController(HelpControllerBase):
+    """Proxy of C++ HtmlHelpController class"""
+    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):
+        """__init__(self, int style=HF_DEFAULT_STYLE, Window parentWindow=None) -> HtmlHelpController"""
+        newobj = _html.new_HtmlHelpController(*args, **kwargs)
+        self.this = newobj.this
+        self.thisown = 1
+        del newobj.thisown

     def __del__(self, destroy=_html.delete_HtmlHelpController):
         """__del__(self)"""
         try:
             if self.thisown: destroy(self)
         except: pass
 
     def __del__(self, destroy=_html.delete_HtmlHelpController):
         """__del__(self)"""
         try:
             if self.thisown: destroy(self)
         except: pass
 

+    def GetHelpWindow(*args, **kwargs):
+        """GetHelpWindow(self) -> HtmlHelpWindow"""
+        return _html.HtmlHelpController_GetHelpWindow(*args, **kwargs)
+
+    def SetHelpWindow(*args, **kwargs):
+        """SetHelpWindow(self, HtmlHelpWindow helpWindow)"""
+        return _html.HtmlHelpController_SetHelpWindow(*args, **kwargs)
+
+    def GetFrame(*args, **kwargs):
+        """GetFrame(self) -> HtmlHelpFrame"""
+        return _html.HtmlHelpController_GetFrame(*args, **kwargs)
+
+    def GetDialog(*args, **kwargs):
+        """GetDialog(self) -> HtmlHelpDialog"""
+        return _html.HtmlHelpController_GetDialog(*args, **kwargs)
+

     def SetTitleFormat(*args, **kwargs):
         """SetTitleFormat(self, String format)"""
         return _html.HtmlHelpController_SetTitleFormat(*args, **kwargs)
     def SetTitleFormat(*args, **kwargs):
         """SetTitleFormat(self, String format)"""
         return _html.HtmlHelpController_SetTitleFormat(*args, **kwargs)


@@ -1646,9 +2055,13 @@ class HtmlHelpController(_core.EvtHandler):
         """WriteCustomization(self, ConfigBase cfg, String path=EmptyString)"""
         return _html.HtmlHelpController_WriteCustomization(*args, **kwargs)
 
         """WriteCustomization(self, ConfigBase cfg, String path=EmptyString)"""
         return _html.HtmlHelpController_WriteCustomization(*args, **kwargs)
 

-    def GetFrame(*args, **kwargs):
-        """GetFrame(self) -> HtmlHelpFrame"""
-        return _html.HtmlHelpController_GetFrame(*args, **kwargs)
+    def MakeModalIfNeeded(*args, **kwargs):
+        """MakeModalIfNeeded(self)"""
+        return _html.HtmlHelpController_MakeModalIfNeeded(*args, **kwargs)
+
+    def FindTopLevelWindow(*args, **kwargs):
+        """FindTopLevelWindow(self) -> Window"""
+        return _html.HtmlHelpController_FindTopLevelWindow(*args, **kwargs)

 
 
 class HtmlHelpControllerPtr(HtmlHelpController):
 
 
 class HtmlHelpControllerPtr(HtmlHelpController):


@@ -1658,4 +2071,26 @@ class HtmlHelpControllerPtr(HtmlHelpController):
         self.__class__ = HtmlHelpController
 _html.HtmlHelpController_swigregister(HtmlHelpControllerPtr)
 
         self.__class__ = HtmlHelpController
 _html.HtmlHelpController_swigregister(HtmlHelpControllerPtr)
 

+class HtmlModalHelp(object):
+    """Proxy of C++ HtmlModalHelp class"""
+    def __repr__(self):
+        return "<%s.%s; proxy of C++ wxHtmlModalHelp instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    def __init__(self, *args, **kwargs):
+        """
+        __init__(self, Window parent, String helpFile, String topic=wxEmptyString, 
+            int style=wxHF_DEFAULT_STYLE|wxHF_DIALOG|wxHF_MODAL) -> HtmlModalHelp
+        """
+        newobj = _html.new_HtmlModalHelp(*args, **kwargs)
+        self.this = newobj.this
+        self.thisown = 1
+        del newobj.thisown
+
+class HtmlModalHelpPtr(HtmlModalHelp):
+    def __init__(self, this):
+        self.this = this
+        if not hasattr(self,"thisown"): self.thisown = 0
+        self.__class__ = HtmlModalHelp
+_html.HtmlModalHelp_swigregister(HtmlModalHelpPtr)
+
+