added missing button state

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

diff --git a/wxPython/src/msw/html.py b/wxPython/src/msw/html.py
index 9352e9c493ba418d773990bd59e859371f063b88..d7fbfda36b9cf0db0b1f656e409d73e59103bd48 100644 (file)
--- a/wxPython/src/msw/html.py
+++ b/wxPython/src/msw/html.py
@@ -1,4 +1,4 @@
-# This file was created automatically by SWIG.
+# This file was created automatically by SWIG 1.3.29.

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


@@ -6,17 +6,17 @@ Classes for a simple HTML rendering window, HTML Help Window, etc.
 """
 
 import _html
 """
 
 import _html

-
+import new
+new_instancemethod = new.instancemethod

 def _swig_setattr_nondynamic(self,class_type,name,value,static=1):
 def _swig_setattr_nondynamic(self,class_type,name,value,static=1):

+    if (name == "thisown"): return self.this.own(value)

     if (name == "this"):
     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
+        if type(value).__name__ == 'PySwigObject':
+            self.__dict__[name] = value

             return
     method = class_type.__swig_setmethods__.get(name,None)
     if method: return method(self,value)
             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"):
+    if (not static) or hasattr(self,name):

         self.__dict__[name] = value
     else:
         raise AttributeError("You cannot add attributes to %s" % self)
         self.__dict__[name] = value
     else:
         raise AttributeError("You cannot add attributes to %s" % self)


@@ -25,10 +25,16 @@ 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):
     return _swig_setattr_nondynamic(self,class_type,name,value,0)
 
 def _swig_getattr(self,class_type,name):

+    if (name == "thisown"): return self.this.own()

     method = class_type.__swig_getmethods__.get(name,None)
     if method: return method(self)
     raise AttributeError,name
 
     method = class_type.__swig_getmethods__.get(name,None)
     if method: return method(self)
     raise AttributeError,name
 

+def _swig_repr(self):
+    try: strthis = "proxy of " + self.this.__repr__()
+    except: strthis = ""
+    return "<%s.%s; %s >" % (self.__class__.__module__, self.__class__.__name__, strthis,)
+

 import types
 try:
     _object = types.ObjectType
 import types
 try:
     _object = types.ObjectType


@@ -41,7 +47,8 @@ del types
 
 def _swig_setattr_nondynamic_method(set):
     def set_attr(self,name,value):
 
 def _swig_setattr_nondynamic_method(set):
     def set_attr(self,name,value):

-        if hasattr(self,name) or (name in ("this", "thisown")):
+        if (name == "thisown"): return self.this.own(value)
+        if hasattr(self,name) or (name == "this"):

             set(self,name,value)
         else:
             raise AttributeError("You cannot add attributes to %s" % self)
             set(self,name,value)
         else:
             raise AttributeError("You cannot add attributes to %s" % self)


@@ -73,13 +80,6 @@ HTML_INDENT_ALL = _html.HTML_INDENT_ALL
 HTML_COND_ISANCHOR = _html.HTML_COND_ISANCHOR
 HTML_COND_ISIMAGEMAP = _html.HTML_COND_ISIMAGEMAP
 HTML_COND_USER = _html.HTML_COND_USER
 HTML_COND_ISANCHOR = _html.HTML_COND_ISANCHOR
 HTML_COND_ISIMAGEMAP = _html.HTML_COND_ISIMAGEMAP
 HTML_COND_USER = _html.HTML_COND_USER

-HTML_FONT_SIZE_1 = _html.HTML_FONT_SIZE_1
-HTML_FONT_SIZE_2 = _html.HTML_FONT_SIZE_2
-HTML_FONT_SIZE_3 = _html.HTML_FONT_SIZE_3
-HTML_FONT_SIZE_4 = _html.HTML_FONT_SIZE_4
-HTML_FONT_SIZE_5 = _html.HTML_FONT_SIZE_5
-HTML_FONT_SIZE_6 = _html.HTML_FONT_SIZE_6
-HTML_FONT_SIZE_7 = _html.HTML_FONT_SIZE_7

 HW_SCROLLBAR_NEVER = _html.HW_SCROLLBAR_NEVER
 HW_SCROLLBAR_AUTO = _html.HW_SCROLLBAR_AUTO
 HW_NO_SELECTION = _html.HW_NO_SELECTION
 HW_SCROLLBAR_NEVER = _html.HW_SCROLLBAR_NEVER
 HW_SCROLLBAR_AUTO = _html.HW_SCROLLBAR_AUTO
 HW_NO_SELECTION = _html.HW_NO_SELECTION


@@ -92,14 +92,11 @@ HTML_URL_IMAGE = _html.HTML_URL_IMAGE
 HTML_URL_OTHER = _html.HTML_URL_OTHER
 class HtmlLinkInfo(_core.Object):
     """Proxy of C++ HtmlLinkInfo class"""
 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):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 

         """__init__(self, String href, String target=EmptyString) -> HtmlLinkInfo"""
         """__init__(self, String href, String target=EmptyString) -> HtmlLinkInfo"""

-        newobj = _html.new_HtmlLinkInfo(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _html.HtmlLinkInfo_swiginit(self,_html.new_HtmlLinkInfo(*args, **kwargs))

     def GetHref(*args, **kwargs):
         """GetHref(self) -> String"""
         return _html.HtmlLinkInfo_GetHref(*args, **kwargs)
     def GetHref(*args, **kwargs):
         """GetHref(self) -> String"""
         return _html.HtmlLinkInfo_GetHref(*args, **kwargs)


@@ -124,13 +121,11 @@ class HtmlLinkInfo(_core.Object):
         """SetHtmlCell(self, HtmlCell e)"""
         return _html.HtmlLinkInfo_SetHtmlCell(*args, **kwargs)
 
         """SetHtmlCell(self, HtmlCell e)"""
         return _html.HtmlLinkInfo_SetHtmlCell(*args, **kwargs)
 

-
-class HtmlLinkInfoPtr(HtmlLinkInfo):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = HtmlLinkInfo
-_html.HtmlLinkInfo_swigregister(HtmlLinkInfoPtr)
+    Event = property(GetEvent,SetEvent,doc="See `GetEvent` and `SetEvent`") 
+    Href = property(GetHref,doc="See `GetHref`") 
+    HtmlCell = property(GetHtmlCell,SetHtmlCell,doc="See `GetHtmlCell` and `SetHtmlCell`") 
+    Target = property(GetTarget,doc="See `GetTarget`") 
+_html.HtmlLinkInfo_swigregister(HtmlLinkInfo)

 cvar = _html.cvar
 HtmlWindowNameStr = cvar.HtmlWindowNameStr
 HtmlPrintoutTitleStr = cvar.HtmlPrintoutTitleStr
 cvar = _html.cvar
 HtmlWindowNameStr = cvar.HtmlWindowNameStr
 HtmlPrintoutTitleStr = cvar.HtmlPrintoutTitleStr


@@ -138,9 +133,9 @@ HtmlPrintingTitleStr = cvar.HtmlPrintingTitleStr
 
 class HtmlTag(_core.Object):
     """Proxy of C++ HtmlTag class"""
 
 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,)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    def __init__(self): raise AttributeError, "No constructor defined"
+    __repr__ = _swig_repr

     def GetName(*args, **kwargs):
         """GetName(self) -> String"""
         return _html.HtmlTag_GetName(*args, **kwargs)
     def GetName(*args, **kwargs):
         """GetName(self) -> String"""
         return _html.HtmlTag_GetName(*args, **kwargs)


@@ -173,19 +168,18 @@ class HtmlTag(_core.Object):
         """GetEndPos2(self) -> int"""
         return _html.HtmlTag_GetEndPos2(*args, **kwargs)
 
         """GetEndPos2(self) -> int"""
         return _html.HtmlTag_GetEndPos2(*args, **kwargs)
 

-
-class HtmlTagPtr(HtmlTag):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = HtmlTag
-_html.HtmlTag_swigregister(HtmlTagPtr)
+    AllParams = property(GetAllParams,doc="See `GetAllParams`") 
+    BeginPos = property(GetBeginPos,doc="See `GetBeginPos`") 
+    EndPos1 = property(GetEndPos1,doc="See `GetEndPos1`") 
+    EndPos2 = property(GetEndPos2,doc="See `GetEndPos2`") 
+    Name = property(GetName,doc="See `GetName`") 
+_html.HtmlTag_swigregister(HtmlTag)

 
 class HtmlParser(_core.Object):
     """Proxy of C++ HtmlParser class"""
 
 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,)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    def __init__(self): raise AttributeError, "No constructor defined"
+    __repr__ = _swig_repr

     def SetFS(*args, **kwargs):
         """SetFS(self, FileSystem fs)"""
         return _html.HtmlParser_SetFS(*args, **kwargs)
     def SetFS(*args, **kwargs):
         """SetFS(self, FileSystem fs)"""
         return _html.HtmlParser_SetFS(*args, **kwargs)


@@ -230,24 +224,21 @@ class HtmlParser(_core.Object):
         """PopTagHandler(self)"""
         return _html.HtmlParser_PopTagHandler(*args, **kwargs)
 
         """PopTagHandler(self)"""
         return _html.HtmlParser_PopTagHandler(*args, **kwargs)
 

+    def GetInnerSource(*args, **kwargs):
+        """GetInnerSource(self, HtmlTag tag) -> String"""
+        return _html.HtmlParser_GetInnerSource(*args, **kwargs)

 
 

-class HtmlParserPtr(HtmlParser):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = HtmlParser
-_html.HtmlParser_swigregister(HtmlParserPtr)
+    FS = property(GetFS,SetFS,doc="See `GetFS` and `SetFS`") 
+    Source = property(GetSource,doc="See `GetSource`") 
+_html.HtmlParser_swigregister(HtmlParser)

 
 class HtmlWinParser(HtmlParser):
     """Proxy of C++ HtmlWinParser class"""
 
 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):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 

         """__init__(self, HtmlWindow wnd=None) -> HtmlWinParser"""
         """__init__(self, HtmlWindow wnd=None) -> HtmlWinParser"""

-        newobj = _html.new_HtmlWinParser(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _html.HtmlWinParser_swiginit(self,_html.new_HtmlWinParser(*args, **kwargs))

     def SetDC(*args, **kwargs):
         """SetDC(self, DC dc)"""
         return _html.HtmlWinParser_SetDC(*args, **kwargs)
     def SetDC(*args, **kwargs):
         """SetDC(self, DC dc)"""
         return _html.HtmlWinParser_SetDC(*args, **kwargs)


@@ -268,6 +259,11 @@ class HtmlWinParser(HtmlParser):
         """GetWindow(self) -> HtmlWindow"""
         return _html.HtmlWinParser_GetWindow(*args, **kwargs)
 
         """GetWindow(self) -> HtmlWindow"""
         return _html.HtmlWinParser_GetWindow(*args, **kwargs)
 

+    GetWindow = wx._deprecated(GetWindow) 
+    def GetWindowInterface(*args, **kwargs):
+        """GetWindowInterface(self) -> HtmlWindowInterface"""
+        return _html.HtmlWinParser_GetWindowInterface(*args, **kwargs)
+

     def SetFonts(*args, **kwargs):
         """SetFonts(self, String normal_face, String fixed_face, PyObject sizes=None)"""
         return _html.HtmlWinParser_SetFonts(*args, **kwargs)
     def SetFonts(*args, **kwargs):
         """SetFonts(self, String normal_face, String fixed_face, PyObject sizes=None)"""
         return _html.HtmlWinParser_SetFonts(*args, **kwargs)


@@ -371,25 +367,31 @@ class HtmlWinParser(HtmlParser):
         """GetLink(self) -> HtmlLinkInfo"""
         return _html.HtmlWinParser_GetLink(*args, **kwargs)
 
         """GetLink(self) -> HtmlLinkInfo"""
         return _html.HtmlWinParser_GetLink(*args, **kwargs)
 

-
-class HtmlWinParserPtr(HtmlWinParser):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = HtmlWinParser
-_html.HtmlWinParser_swigregister(HtmlWinParserPtr)
+    ActualColor = property(GetActualColor,SetActualColor,doc="See `GetActualColor` and `SetActualColor`") 
+    ActualColour = property(GetActualColour,SetActualColour,doc="See `GetActualColour` and `SetActualColour`") 
+    Align = property(GetAlign,SetAlign,doc="See `GetAlign` and `SetAlign`") 
+    CharHeight = property(GetCharHeight,doc="See `GetCharHeight`") 
+    CharWidth = property(GetCharWidth,doc="See `GetCharWidth`") 
+    Container = property(GetContainer,SetContainer,doc="See `GetContainer` and `SetContainer`") 
+    DC = property(GetDC,SetDC,doc="See `GetDC` and `SetDC`") 
+    FontBold = property(GetFontBold,SetFontBold,doc="See `GetFontBold` and `SetFontBold`") 
+    FontFixed = property(GetFontFixed,SetFontFixed,doc="See `GetFontFixed` and `SetFontFixed`") 
+    FontItalic = property(GetFontItalic,SetFontItalic,doc="See `GetFontItalic` and `SetFontItalic`") 
+    FontSize = property(GetFontSize,SetFontSize,doc="See `GetFontSize` and `SetFontSize`") 
+    FontUnderlined = property(GetFontUnderlined,SetFontUnderlined,doc="See `GetFontUnderlined` and `SetFontUnderlined`") 
+    Link = property(GetLink,SetLink,doc="See `GetLink` and `SetLink`") 
+    LinkColor = property(GetLinkColor,SetLinkColor,doc="See `GetLinkColor` and `SetLinkColor`") 
+    WindowInterface = property(GetWindowInterface,doc="See `GetWindowInterface`") 
+_html.HtmlWinParser_swigregister(HtmlWinParser)

 
 class HtmlTagHandler(_core.Object):
     """Proxy of C++ HtmlTagHandler class"""
 
 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):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 

         """__init__(self) -> HtmlTagHandler"""
         """__init__(self) -> HtmlTagHandler"""

-        newobj = _html.new_HtmlTagHandler(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-        self._setCallbackInfo(self, HtmlTagHandler)
+        _html.HtmlTagHandler_swiginit(self,_html.new_HtmlTagHandler(*args, **kwargs))
+        HtmlTagHandler._setCallbackInfo(self, self, HtmlTagHandler)

 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""


@@ -407,25 +409,17 @@ class HtmlTagHandler(_core.Object):
         """ParseInner(self, HtmlTag tag)"""
         return _html.HtmlTagHandler_ParseInner(*args, **kwargs)
 
         """ParseInner(self, HtmlTag tag)"""
         return _html.HtmlTagHandler_ParseInner(*args, **kwargs)
 

-
-class HtmlTagHandlerPtr(HtmlTagHandler):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = HtmlTagHandler
-_html.HtmlTagHandler_swigregister(HtmlTagHandlerPtr)
+    Parser = property(GetParser,SetParser,doc="See `GetParser` and `SetParser`") 
+_html.HtmlTagHandler_swigregister(HtmlTagHandler)

 
 class HtmlWinTagHandler(HtmlTagHandler):
     """Proxy of C++ HtmlWinTagHandler class"""
 
 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):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 

         """__init__(self) -> HtmlWinTagHandler"""
         """__init__(self) -> HtmlWinTagHandler"""

-        newobj = _html.new_HtmlWinTagHandler(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-        self._setCallbackInfo(self, HtmlWinTagHandler)
+        _html.HtmlWinTagHandler_swiginit(self,_html.new_HtmlWinTagHandler(*args, **kwargs))
+        HtmlWinTagHandler._setCallbackInfo(self, self, HtmlWinTagHandler)

 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""


@@ -443,36 +437,24 @@ class HtmlWinTagHandler(HtmlTagHandler):
         """ParseInner(self, HtmlTag tag)"""
         return _html.HtmlWinTagHandler_ParseInner(*args, **kwargs)
 
         """ParseInner(self, HtmlTag tag)"""
         return _html.HtmlWinTagHandler_ParseInner(*args, **kwargs)
 

-
-class HtmlWinTagHandlerPtr(HtmlWinTagHandler):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = HtmlWinTagHandler
-_html.HtmlWinTagHandler_swigregister(HtmlWinTagHandlerPtr)
+    Parser = property(GetParser,SetParser,doc="See `GetParser` and `SetParser`") 
+_html.HtmlWinTagHandler_swigregister(HtmlWinTagHandler)

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

-    """HtmlWinParser_AddTagHandler(PyObject tagHandlerClass)"""
-    return _html.HtmlWinParser_AddTagHandler(*args, **kwargs)
+  """HtmlWinParser_AddTagHandler(PyObject tagHandlerClass)"""
+  return _html.HtmlWinParser_AddTagHandler(*args, **kwargs)

 #---------------------------------------------------------------------------
 
 class HtmlSelection(object):
     """Proxy of C++ HtmlSelection class"""
 #---------------------------------------------------------------------------
 
 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):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 

         """__init__(self) -> HtmlSelection"""
         """__init__(self) -> HtmlSelection"""

-        newobj = _html.new_HtmlSelection(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-    def __del__(self, destroy=_html.delete_HtmlSelection):
-        """__del__(self)"""
-        try:
-            if self.thisown: destroy(self)
-        except: pass
-
+        _html.HtmlSelection_swiginit(self,_html.new_HtmlSelection(*args, **kwargs))
+    __swig_destroy__ = _html.delete_HtmlSelection
+    __del__ = lambda self : None;

     def Set(*args, **kwargs):
         """Set(self, Point fromPos, HtmlCell fromCell, Point toPos, HtmlCell toCell)"""
         return _html.HtmlSelection_Set(*args, **kwargs)
     def Set(*args, **kwargs):
         """Set(self, Point fromPos, HtmlCell fromCell, Point toPos, HtmlCell toCell)"""
         return _html.HtmlSelection_Set(*args, **kwargs)


@@ -521,33 +503,26 @@ class HtmlSelection(object):
         """IsEmpty(self) -> bool"""
         return _html.HtmlSelection_IsEmpty(*args, **kwargs)
 
         """IsEmpty(self) -> bool"""
         return _html.HtmlSelection_IsEmpty(*args, **kwargs)
 

-
-class HtmlSelectionPtr(HtmlSelection):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = HtmlSelection
-_html.HtmlSelection_swigregister(HtmlSelectionPtr)
+    FromCell = property(GetFromCell,doc="See `GetFromCell`") 
+    FromPos = property(GetFromPos,doc="See `GetFromPos`") 
+    FromPrivPos = property(GetFromPrivPos,SetFromPrivPos,doc="See `GetFromPrivPos` and `SetFromPrivPos`") 
+    ToCell = property(GetToCell,doc="See `GetToCell`") 
+    ToPos = property(GetToPos,doc="See `GetToPos`") 
+    ToPrivPos = property(GetToPrivPos,SetToPrivPos,doc="See `GetToPrivPos` and `SetToPrivPos`") 
+_html.HtmlSelection_swigregister(HtmlSelection)

 
 HTML_SEL_OUT = _html.HTML_SEL_OUT
 HTML_SEL_IN = _html.HTML_SEL_IN
 HTML_SEL_CHANGING = _html.HTML_SEL_CHANGING
 class HtmlRenderingState(object):
     """Proxy of C++ HtmlRenderingState class"""
 
 HTML_SEL_OUT = _html.HTML_SEL_OUT
 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):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 

         """__init__(self) -> HtmlRenderingState"""
         """__init__(self) -> HtmlRenderingState"""

-        newobj = _html.new_HtmlRenderingState(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-    def __del__(self, destroy=_html.delete_HtmlRenderingState):
-        """__del__(self)"""
-        try:
-            if self.thisown: destroy(self)
-        except: pass
-
+        _html.HtmlRenderingState_swiginit(self,_html.new_HtmlRenderingState(*args, **kwargs))
+    __swig_destroy__ = _html.delete_HtmlRenderingState
+    __del__ = lambda self : None;

     def SetSelectionState(*args, **kwargs):
         """SetSelectionState(self, int s)"""
         return _html.HtmlRenderingState_SetSelectionState(*args, **kwargs)
     def SetSelectionState(*args, **kwargs):
         """SetSelectionState(self, int s)"""
         return _html.HtmlRenderingState_SetSelectionState(*args, **kwargs)


@@ -572,19 +547,16 @@ class HtmlRenderingState(object):
         """GetBgColour(self) -> Colour"""
         return _html.HtmlRenderingState_GetBgColour(*args, **kwargs)
 
         """GetBgColour(self) -> Colour"""
         return _html.HtmlRenderingState_GetBgColour(*args, **kwargs)
 

-
-class HtmlRenderingStatePtr(HtmlRenderingState):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = HtmlRenderingState
-_html.HtmlRenderingState_swigregister(HtmlRenderingStatePtr)
+    BgColour = property(GetBgColour,SetBgColour,doc="See `GetBgColour` and `SetBgColour`") 
+    FgColour = property(GetFgColour,SetFgColour,doc="See `GetFgColour` and `SetFgColour`") 
+    SelectionState = property(GetSelectionState,SetSelectionState,doc="See `GetSelectionState` and `SetSelectionState`") 
+_html.HtmlRenderingState_swigregister(HtmlRenderingState)

 
 class HtmlRenderingStyle(object):
     """Proxy of C++ HtmlRenderingStyle class"""
 
 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,)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    def __init__(self): raise AttributeError, "No constructor defined"
+    __repr__ = _swig_repr

     def GetSelectedTextColour(*args, **kwargs):
         """GetSelectedTextColour(self, Colour clr) -> Colour"""
         return _html.HtmlRenderingStyle_GetSelectedTextColour(*args, **kwargs)
     def GetSelectedTextColour(*args, **kwargs):
         """GetSelectedTextColour(self, Colour clr) -> Colour"""
         return _html.HtmlRenderingStyle_GetSelectedTextColour(*args, **kwargs)


@@ -593,51 +565,26 @@ class HtmlRenderingStyle(object):
         """GetSelectedTextBgColour(self, Colour clr) -> Colour"""
         return _html.HtmlRenderingStyle_GetSelectedTextBgColour(*args, **kwargs)
 
         """GetSelectedTextBgColour(self, Colour clr) -> Colour"""
         return _html.HtmlRenderingStyle_GetSelectedTextBgColour(*args, **kwargs)
 

-
-class HtmlRenderingStylePtr(HtmlRenderingStyle):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = HtmlRenderingStyle
-_html.HtmlRenderingStyle_swigregister(HtmlRenderingStylePtr)
+    SelectedTextBgColour = property(GetSelectedTextBgColour,doc="See `GetSelectedTextBgColour`") 
+    SelectedTextColour = property(GetSelectedTextColour,doc="See `GetSelectedTextColour`") 
+_html.HtmlRenderingStyle_swigregister(HtmlRenderingStyle)

 
 class DefaultHtmlRenderingStyle(HtmlRenderingStyle):
     """Proxy of C++ DefaultHtmlRenderingStyle class"""
 
 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 GetSelectedTextColour(*args, **kwargs):
-        """GetSelectedTextColour(self, Colour clr) -> Colour"""
-        return _html.DefaultHtmlRenderingStyle_GetSelectedTextColour(*args, **kwargs)
-
-    def GetSelectedTextBgColour(*args, **kwargs):
-        """GetSelectedTextBgColour(self, Colour clr) -> Colour"""
-        return _html.DefaultHtmlRenderingStyle_GetSelectedTextBgColour(*args, **kwargs)
-
-
-class DefaultHtmlRenderingStylePtr(DefaultHtmlRenderingStyle):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = DefaultHtmlRenderingStyle
-_html.DefaultHtmlRenderingStyle_swigregister(DefaultHtmlRenderingStylePtr)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    def __init__(self): raise AttributeError, "No constructor defined"
+    __repr__ = _swig_repr
+_html.DefaultHtmlRenderingStyle_swigregister(DefaultHtmlRenderingStyle)

 
 class HtmlRenderingInfo(object):
     """Proxy of C++ HtmlRenderingInfo class"""
 
 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):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 

         """__init__(self) -> HtmlRenderingInfo"""
         """__init__(self) -> HtmlRenderingInfo"""

-        newobj = _html.new_HtmlRenderingInfo(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-    def __del__(self, destroy=_html.delete_HtmlRenderingInfo):
-        """__del__(self)"""
-        try:
-            if self.thisown: destroy(self)
-        except: pass
-
+        _html.HtmlRenderingInfo_swiginit(self,_html.new_HtmlRenderingInfo(*args, **kwargs))
+    __swig_destroy__ = _html.delete_HtmlRenderingInfo
+    __del__ = lambda self : None;

     def SetSelection(*args, **kwargs):
         """SetSelection(self, HtmlSelection s)"""
         return _html.HtmlRenderingInfo_SetSelection(*args, **kwargs)
     def SetSelection(*args, **kwargs):
         """SetSelection(self, HtmlSelection s)"""
         return _html.HtmlRenderingInfo_SetSelection(*args, **kwargs)


@@ -658,13 +605,10 @@ class HtmlRenderingInfo(object):
         """GetState(self) -> HtmlRenderingState"""
         return _html.HtmlRenderingInfo_GetState(*args, **kwargs)
 
         """GetState(self) -> HtmlRenderingState"""
         return _html.HtmlRenderingInfo_GetState(*args, **kwargs)
 

-
-class HtmlRenderingInfoPtr(HtmlRenderingInfo):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = HtmlRenderingInfo
-_html.HtmlRenderingInfo_swigregister(HtmlRenderingInfoPtr)
+    Selection = property(GetSelection,SetSelection,doc="See `GetSelection` and `SetSelection`") 
+    State = property(GetState,doc="See `GetState`") 
+    Style = property(GetStyle,SetStyle,doc="See `GetStyle` and `SetStyle`") 
+_html.HtmlRenderingInfo_swigregister(HtmlRenderingInfo)

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -673,14 +617,13 @@ 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"""
 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):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 

         """__init__(self) -> HtmlCell"""
         """__init__(self) -> HtmlCell"""

-        newobj = _html.new_HtmlCell(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _html.HtmlCell_swiginit(self,_html.new_HtmlCell(*args, **kwargs))
+    __swig_destroy__ = _html.delete_HtmlCell
+    __del__ = lambda self : None;

     def GetPosX(*args, **kwargs):
         """GetPosX(self) -> int"""
         return _html.HtmlCell_GetPosX(*args, **kwargs)
     def GetPosX(*args, **kwargs):
         """GetPosX(self) -> int"""
         return _html.HtmlCell_GetPosX(*args, **kwargs)


@@ -729,10 +672,15 @@ class HtmlCell(_core.Object):
         """GetFirstChild(self) -> HtmlCell"""
         return _html.HtmlCell_GetFirstChild(*args, **kwargs)
 
         """GetFirstChild(self) -> HtmlCell"""
         return _html.HtmlCell_GetFirstChild(*args, **kwargs)
 

+    def GetMouseCursor(*args, **kwargs):
+        """GetMouseCursor(self, HtmlWindowInterface window) -> Cursor"""
+        return _html.HtmlCell_GetMouseCursor(*args, **kwargs)
+

     def GetCursor(*args, **kwargs):
         """GetCursor(self) -> Cursor"""
         return _html.HtmlCell_GetCursor(*args, **kwargs)
 
     def GetCursor(*args, **kwargs):
         """GetCursor(self) -> Cursor"""
         return _html.HtmlCell_GetCursor(*args, **kwargs)
 

+    GetCursor = wx._deprecated(GetCursor) 

     def IsFormattingCell(*args, **kwargs):
         """IsFormattingCell(self) -> bool"""
         return _html.HtmlCell_IsFormattingCell(*args, **kwargs)
     def IsFormattingCell(*args, **kwargs):
         """IsFormattingCell(self) -> bool"""
         return _html.HtmlCell_IsFormattingCell(*args, **kwargs)


@@ -769,9 +717,9 @@ class HtmlCell(_core.Object):
         """Find(self, int condition, void param) -> HtmlCell"""
         return _html.HtmlCell_Find(*args, **kwargs)
 
         """Find(self, int condition, void param) -> HtmlCell"""
         return _html.HtmlCell_Find(*args, **kwargs)
 

-    def AdjustPagebreak(*args, **kwargs):
-        """AdjustPagebreak(self, int INOUT) -> bool"""
-        return _html.HtmlCell_AdjustPagebreak(*args, **kwargs)
+    def ProcessMouseClick(*args, **kwargs):
+        """ProcessMouseClick(self, HtmlWindowInterface window, Point pos, MouseEvent event) -> bool"""
+        return _html.HtmlCell_ProcessMouseClick(*args, **kwargs)

 
     def SetCanLiveOnPagebreak(*args, **kwargs):
         """SetCanLiveOnPagebreak(self, bool can)"""
 
     def SetCanLiveOnPagebreak(*args, **kwargs):
         """SetCanLiveOnPagebreak(self, bool can)"""


@@ -790,9 +738,13 @@ class HtmlCell(_core.Object):
         return _html.HtmlCell_FindCellByPos(*args, **kwargs)
 
     def GetAbsPos(*args, **kwargs):
         return _html.HtmlCell_FindCellByPos(*args, **kwargs)
 
     def GetAbsPos(*args, **kwargs):

-        """GetAbsPos(self) -> Point"""
+        """GetAbsPos(self, HtmlCell rootCell=None) -> Point"""

         return _html.HtmlCell_GetAbsPos(*args, **kwargs)
 
         return _html.HtmlCell_GetAbsPos(*args, **kwargs)
 

+    def GetRootCell(*args, **kwargs):
+        """GetRootCell(self) -> HtmlCell"""
+        return _html.HtmlCell_GetRootCell(*args, **kwargs)
+

     def GetFirstTerminal(*args, **kwargs):
         """GetFirstTerminal(self) -> HtmlCell"""
         return _html.HtmlCell_GetFirstTerminal(*args, **kwargs)
     def GetFirstTerminal(*args, **kwargs):
         """GetFirstTerminal(self) -> HtmlCell"""
         return _html.HtmlCell_GetFirstTerminal(*args, **kwargs)


@@ -813,42 +765,53 @@ class HtmlCell(_core.Object):
         """ConvertToText(self, HtmlSelection sel) -> String"""
         return _html.HtmlCell_ConvertToText(*args, **kwargs)
 
         """ConvertToText(self, HtmlSelection sel) -> String"""
         return _html.HtmlCell_ConvertToText(*args, **kwargs)
 

-
-class HtmlCellPtr(HtmlCell):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = HtmlCell
-_html.HtmlCell_swigregister(HtmlCellPtr)
+    Cursor = property(GetCursor,doc="See `GetCursor`") 
+    Depth = property(GetDepth,doc="See `GetDepth`") 
+    Descent = property(GetDescent,doc="See `GetDescent`") 
+    FirstChild = property(GetFirstChild,doc="See `GetFirstChild`") 
+    FirstTerminal = property(GetFirstTerminal,doc="See `GetFirstTerminal`") 
+    Height = property(GetHeight,doc="See `GetHeight`") 
+    Id = property(GetId,SetId,doc="See `GetId` and `SetId`") 
+    LastTerminal = property(GetLastTerminal,doc="See `GetLastTerminal`") 
+    Link = property(GetLink,SetLink,doc="See `GetLink` and `SetLink`") 
+    MaxTotalWidth = property(GetMaxTotalWidth,doc="See `GetMaxTotalWidth`") 
+    MouseCursor = property(GetMouseCursor,doc="See `GetMouseCursor`") 
+    Next = property(GetNext,SetNext,doc="See `GetNext` and `SetNext`") 
+    Parent = property(GetParent,SetParent,doc="See `GetParent` and `SetParent`") 
+    PosX = property(GetPosX,doc="See `GetPosX`") 
+    PosY = property(GetPosY,doc="See `GetPosY`") 
+    RootCell = property(GetRootCell,doc="See `GetRootCell`") 
+    Width = property(GetWidth,doc="See `GetWidth`") 
+_html.HtmlCell_swigregister(HtmlCell)

 
 class HtmlWordCell(HtmlCell):
     """Proxy of C++ HtmlWordCell class"""
 
 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):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 

         """__init__(self, String word, DC dc) -> HtmlWordCell"""
         """__init__(self, String word, DC dc) -> HtmlWordCell"""

-        newobj = _html.new_HtmlWordCell(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-
-class HtmlWordCellPtr(HtmlWordCell):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = HtmlWordCell
-_html.HtmlWordCell_swigregister(HtmlWordCellPtr)
+        _html.HtmlWordCell_swiginit(self,_html.new_HtmlWordCell(*args, **kwargs))
+    def ConvertToText(*args, **kwargs):
+        """ConvertToText(self, HtmlSelection sel) -> String"""
+        return _html.HtmlWordCell_ConvertToText(*args, **kwargs)
+
+    def IsLinebreakAllowed(*args, **kwargs):
+        """IsLinebreakAllowed(self) -> bool"""
+        return _html.HtmlWordCell_IsLinebreakAllowed(*args, **kwargs)
+
+    def SetPreviousWord(*args, **kwargs):
+        """SetPreviousWord(self, HtmlWordCell cell)"""
+        return _html.HtmlWordCell_SetPreviousWord(*args, **kwargs)
+
+_html.HtmlWordCell_swigregister(HtmlWordCell)

 
 class HtmlContainerCell(HtmlCell):
     """Proxy of C++ HtmlContainerCell class"""
 
 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):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 

         """__init__(self, HtmlContainerCell parent) -> HtmlContainerCell"""
         """__init__(self, HtmlContainerCell parent) -> HtmlContainerCell"""

-        newobj = _html.new_HtmlContainerCell(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _html.HtmlContainerCell_swiginit(self,_html.new_HtmlContainerCell(*args, **kwargs))

     def InsertCell(*args, **kwargs):
         """InsertCell(self, HtmlCell cell)"""
         return _html.HtmlContainerCell_InsertCell(*args, **kwargs)
     def InsertCell(*args, **kwargs):
         """InsertCell(self, HtmlCell cell)"""
         return _html.HtmlContainerCell_InsertCell(*args, **kwargs)


@@ -913,111 +876,114 @@ class HtmlContainerCell(HtmlCell):
         """GetFirstChild(self) -> HtmlCell"""
         return _html.HtmlContainerCell_GetFirstChild(*args, **kwargs)
 
         """GetFirstChild(self) -> HtmlCell"""
         return _html.HtmlContainerCell_GetFirstChild(*args, **kwargs)
 

-
-class HtmlContainerCellPtr(HtmlContainerCell):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = HtmlContainerCell
-_html.HtmlContainerCell_swigregister(HtmlContainerCellPtr)
+    AlignHor = property(GetAlignHor,SetAlignHor,doc="See `GetAlignHor` and `SetAlignHor`") 
+    AlignVer = property(GetAlignVer,SetAlignVer,doc="See `GetAlignVer` and `SetAlignVer`") 
+    BackgroundColour = property(GetBackgroundColour,SetBackgroundColour,doc="See `GetBackgroundColour` and `SetBackgroundColour`") 
+    FirstChild = property(GetFirstChild,doc="See `GetFirstChild`") 
+    Indent = property(GetIndent,SetIndent,doc="See `GetIndent` and `SetIndent`") 
+    IndentUnits = property(GetIndentUnits,doc="See `GetIndentUnits`") 
+_html.HtmlContainerCell_swigregister(HtmlContainerCell)

 
 class HtmlColourCell(HtmlCell):
     """Proxy of C++ HtmlColourCell class"""
 
 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):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 

         """__init__(self, Colour clr, int flags=HTML_CLR_FOREGROUND) -> HtmlColourCell"""
         """__init__(self, Colour clr, int flags=HTML_CLR_FOREGROUND) -> HtmlColourCell"""

-        newobj = _html.new_HtmlColourCell(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-
-class HtmlColourCellPtr(HtmlColourCell):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = HtmlColourCell
-_html.HtmlColourCell_swigregister(HtmlColourCellPtr)
+        _html.HtmlColourCell_swiginit(self,_html.new_HtmlColourCell(*args, **kwargs))
+_html.HtmlColourCell_swigregister(HtmlColourCell)

 
 class HtmlFontCell(HtmlCell):
     """Proxy of C++ HtmlFontCell class"""
 
 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):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 

         """__init__(self, Font font) -> HtmlFontCell"""
         """__init__(self, Font font) -> HtmlFontCell"""

-        newobj = _html.new_HtmlFontCell(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-
-class HtmlFontCellPtr(HtmlFontCell):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = HtmlFontCell
-_html.HtmlFontCell_swigregister(HtmlFontCellPtr)
+        _html.HtmlFontCell_swiginit(self,_html.new_HtmlFontCell(*args, **kwargs))
+_html.HtmlFontCell_swigregister(HtmlFontCell)

 
 class HtmlWidgetCell(HtmlCell):
     """Proxy of C++ HtmlWidgetCell class"""
 
 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):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 

         """__init__(self, Window wnd, int w=0) -> HtmlWidgetCell"""
         """__init__(self, Window wnd, int w=0) -> HtmlWidgetCell"""

-        newobj = _html.new_HtmlWidgetCell(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-
-class HtmlWidgetCellPtr(HtmlWidgetCell):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = HtmlWidgetCell
-_html.HtmlWidgetCell_swigregister(HtmlWidgetCellPtr)
+        _html.HtmlWidgetCell_swiginit(self,_html.new_HtmlWidgetCell(*args, **kwargs))
+_html.HtmlWidgetCell_swigregister(HtmlWidgetCell)

 
 #---------------------------------------------------------------------------
 
 class HtmlFilter(_core.Object):
     """Proxy of C++ HtmlFilter class"""
 
 #---------------------------------------------------------------------------
 
 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):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 

         """__init__(self) -> HtmlFilter"""
         """__init__(self) -> HtmlFilter"""

-        newobj = _html.new_HtmlFilter(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-        self._setCallbackInfo(self, HtmlFilter)
+        _html.HtmlFilter_swiginit(self,_html.new_HtmlFilter(*args, **kwargs))
+        HtmlFilter._setCallbackInfo(self, self, HtmlFilter)

 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _html.HtmlFilter__setCallbackInfo(*args, **kwargs)
 
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _html.HtmlFilter__setCallbackInfo(*args, **kwargs)
 

-
-class HtmlFilterPtr(HtmlFilter):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = HtmlFilter
-_html.HtmlFilter_swigregister(HtmlFilterPtr)
+_html.HtmlFilter_swigregister(HtmlFilter)
+
+class HtmlWindowInterface(object):
+    """Proxy of C++ HtmlWindowInterface class"""
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    def __init__(self): raise AttributeError, "No constructor defined"
+    __repr__ = _swig_repr
+    __swig_destroy__ = _html.delete_HtmlWindowInterface
+    __del__ = lambda self : None;
+    def SetHTMLWindowTitle(*args, **kwargs):
+        """SetHTMLWindowTitle(self, String title)"""
+        return _html.HtmlWindowInterface_SetHTMLWindowTitle(*args, **kwargs)
+
+    def HTMLCoordsToWindow(*args, **kwargs):
+        """HTMLCoordsToWindow(self, HtmlCell cell, Point pos) -> Point"""
+        return _html.HtmlWindowInterface_HTMLCoordsToWindow(*args, **kwargs)
+
+    def GetHTMLWindow(*args, **kwargs):
+        """GetHTMLWindow(self) -> Window"""
+        return _html.HtmlWindowInterface_GetHTMLWindow(*args, **kwargs)
+
+    def GetHTMLBackgroundColour(*args, **kwargs):
+        """GetHTMLBackgroundColour(self) -> Colour"""
+        return _html.HtmlWindowInterface_GetHTMLBackgroundColour(*args, **kwargs)
+
+    def SetHTMLBackgroundColour(*args, **kwargs):
+        """SetHTMLBackgroundColour(self, Colour clr)"""
+        return _html.HtmlWindowInterface_SetHTMLBackgroundColour(*args, **kwargs)
+
+    def SetHTMLBackgroundImage(*args, **kwargs):
+        """SetHTMLBackgroundImage(self, Bitmap bmpBg)"""
+        return _html.HtmlWindowInterface_SetHTMLBackgroundImage(*args, **kwargs)
+
+    def SetHTMLStatusText(*args, **kwargs):
+        """SetHTMLStatusText(self, String text)"""
+        return _html.HtmlWindowInterface_SetHTMLStatusText(*args, **kwargs)
+
+    HTMLCursor_Default = _html.HtmlWindowInterface_HTMLCursor_Default
+    HTMLCursor_Link = _html.HtmlWindowInterface_HTMLCursor_Link
+    HTMLCursor_Text = _html.HtmlWindowInterface_HTMLCursor_Text
+    HTMLBackgroundColour = property(GetHTMLBackgroundColour,SetHTMLBackgroundColour,doc="See `GetHTMLBackgroundColour` and `SetHTMLBackgroundColour`") 
+    HTMLWindow = property(GetHTMLWindow,doc="See `GetHTMLWindow`") 
+_html.HtmlWindowInterface_swigregister(HtmlWindowInterface)

 
 #---------------------------------------------------------------------------
 
 class HtmlWindow(_windows.ScrolledWindow):
     """Proxy of C++ HtmlWindow class"""
 
 #---------------------------------------------------------------------------
 
 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):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 

         """
         __init__(self, Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, int style=HW_DEFAULT_STYLE, 
             String name=HtmlWindowNameStr) -> HtmlWindow
         """
         """
         __init__(self, Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, int style=HW_DEFAULT_STYLE, 
             String name=HtmlWindowNameStr) -> HtmlWindow
         """

-        newobj = _html.new_HtmlWindow(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-        self._setCallbackInfo(self, HtmlWindow); self._setOORInfo(self)
+        _html.HtmlWindow_swiginit(self,_html.new_HtmlWindow(*args, **kwargs))
+        self._setOORInfo(self);HtmlWindow._setCallbackInfo(self, self, HtmlWindow)

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


@@ -1079,14 +1045,14 @@ class HtmlWindow(_windows.ScrolledWindow):
         """SetStandardFonts(self, int size=-1, String normal_face=EmptyString, String fixed_face=EmptyString)"""
         return _html.HtmlWindow_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)
-

     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)


@@ -1156,21 +1122,45 @@ class HtmlWindow(_windows.ScrolledWindow):
         """ToText(self) -> String"""
         return _html.HtmlWindow_ToText(*args, **kwargs)
 
         """ToText(self) -> String"""
         return _html.HtmlWindow_ToText(*args, **kwargs)
 

-    def base_OnLinkClicked(*args, **kwargs):
-        """base_OnLinkClicked(self, HtmlLinkInfo link)"""
-        return _html.HtmlWindow_base_OnLinkClicked(*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) -> bool"""
+        return _html.HtmlWindow_OnCellClicked(*args, **kwargs)
+
+    def OnOpeningURL(*args, **kwargs):
+        """OnOpeningURL(self, int type, String url, String redirect) -> int"""
+        return _html.HtmlWindow_OnOpeningURL(*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):
         """


@@ -1190,26 +1180,33 @@ class HtmlWindow(_windows.ScrolledWindow):
         return _html.HtmlWindow_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
         return _html.HtmlWindow_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)

-
-class HtmlWindowPtr(HtmlWindow):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = HtmlWindow
-_html.HtmlWindow_swigregister(HtmlWindowPtr)
+    HTMLCursor_Default = _html.HtmlWindow_HTMLCursor_Default
+    HTMLCursor_Link = _html.HtmlWindow_HTMLCursor_Link
+    HTMLCursor_Text = _html.HtmlWindow_HTMLCursor_Text
+    def GetDefaultHTMLCursor(*args, **kwargs):
+        """GetDefaultHTMLCursor(int type) -> Cursor"""
+        return _html.HtmlWindow_GetDefaultHTMLCursor(*args, **kwargs)
+
+    GetDefaultHTMLCursor = staticmethod(GetDefaultHTMLCursor)
+    InternalRepresentation = property(GetInternalRepresentation,doc="See `GetInternalRepresentation`") 
+    OpenedAnchor = property(GetOpenedAnchor,doc="See `GetOpenedAnchor`") 
+    OpenedPage = property(GetOpenedPage,doc="See `GetOpenedPage`") 
+    OpenedPageTitle = property(GetOpenedPageTitle,doc="See `GetOpenedPageTitle`") 
+    Parser = property(GetParser,doc="See `GetParser`") 
+    RelatedFrame = property(GetRelatedFrame,doc="See `GetRelatedFrame`") 
+_html.HtmlWindow_swigregister(HtmlWindow)

 
 def PreHtmlWindow(*args, **kwargs):
     """PreHtmlWindow() -> HtmlWindow"""
     val = _html.new_PreHtmlWindow(*args, **kwargs)
 
 def PreHtmlWindow(*args, **kwargs):
     """PreHtmlWindow() -> HtmlWindow"""
     val = _html.new_PreHtmlWindow(*args, **kwargs)

-    val.thisown = 1

     return val
 
 def HtmlWindow_AddFilter(*args, **kwargs):
     return val
 
 def HtmlWindow_AddFilter(*args, **kwargs):

-    """HtmlWindow_AddFilter(HtmlFilter filter)"""
-    return _html.HtmlWindow_AddFilter(*args, **kwargs)
+  """HtmlWindow_AddFilter(HtmlFilter filter)"""
+  return _html.HtmlWindow_AddFilter(*args, **kwargs)

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

-    """
+  """

     HtmlWindow_GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes
 
     Get the default attributes for this class.  This is useful if you want
     HtmlWindow_GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes
 
     Get the default attributes for this class.  This is useful if you want


@@ -1223,26 +1220,23 @@ def HtmlWindow_GetClassDefaultAttributes(*args, **kwargs):
     the returned font. See `wx.Window.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)
+
+def HtmlWindow_GetDefaultHTMLCursor(*args, **kwargs):
+  """HtmlWindow_GetDefaultHTMLCursor(int type) -> Cursor"""
+  return _html.HtmlWindow_GetDefaultHTMLCursor(*args, **kwargs)

 
 #---------------------------------------------------------------------------
 
 class HtmlDCRenderer(_core.Object):
     """Proxy of C++ HtmlDCRenderer class"""
 
 #---------------------------------------------------------------------------
 
 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):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 

         """__init__(self) -> HtmlDCRenderer"""
         """__init__(self) -> HtmlDCRenderer"""

-        newobj = _html.new_HtmlDCRenderer(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-    def __del__(self, destroy=_html.delete_HtmlDCRenderer):
-        """__del__(self)"""
-        try:
-            if self.thisown: destroy(self)
-        except: pass
-
+        _html.HtmlDCRenderer_swiginit(self,_html.new_HtmlDCRenderer(*args, **kwargs))
+    __swig_destroy__ = _html.delete_HtmlDCRenderer
+    __del__ = lambda self : None;

     def SetDC(*args, **kwargs):
         """SetDC(self, DC dc, int maxwidth)"""
         return _html.HtmlDCRenderer_SetDC(*args, **kwargs)
     def SetDC(*args, **kwargs):
         """SetDC(self, DC dc, int maxwidth)"""
         return _html.HtmlDCRenderer_SetDC(*args, **kwargs)


@@ -1265,8 +1259,8 @@ class HtmlDCRenderer(_core.Object):
 
     def Render(*args, **kwargs):
         """
 
     def Render(*args, **kwargs):
         """

-        Render(self, int x, int y, int from=0, int dont_render=False, int maxHeight=INT_MAX, 
-            int choices=None, int LCOUNT=0) -> int
+        Render(self, int x, int y, wxArrayInt known_pagebreaks, int from=0, 
+            int dont_render=False, int to=INT_MAX) -> int

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


@@ -1274,27 +1268,19 @@ class HtmlDCRenderer(_core.Object):
         """GetTotalHeight(self) -> int"""
         return _html.HtmlDCRenderer_GetTotalHeight(*args, **kwargs)
 
         """GetTotalHeight(self) -> int"""
         return _html.HtmlDCRenderer_GetTotalHeight(*args, **kwargs)
 

-
-class HtmlDCRendererPtr(HtmlDCRenderer):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = HtmlDCRenderer
-_html.HtmlDCRenderer_swigregister(HtmlDCRendererPtr)
+    TotalHeight = property(GetTotalHeight,doc="See `GetTotalHeight`") 
+_html.HtmlDCRenderer_swigregister(HtmlDCRenderer)

 
 PAGE_ODD = _html.PAGE_ODD
 PAGE_EVEN = _html.PAGE_EVEN
 PAGE_ALL = _html.PAGE_ALL
 class HtmlPrintout(_windows.Printout):
     """Proxy of C++ HtmlPrintout class"""
 
 PAGE_ODD = _html.PAGE_ODD
 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):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 

         """__init__(self, String title=HtmlPrintoutTitleStr) -> HtmlPrintout"""
         """__init__(self, String title=HtmlPrintoutTitleStr) -> HtmlPrintout"""

-        newobj = _html.new_HtmlPrintout(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _html.HtmlPrintout_swiginit(self,_html.new_HtmlPrintout(*args, **kwargs))

     def SetHtmlText(*args, **kwargs):
         """SetHtmlText(self, String html, String basepath=EmptyString, bool isdir=True)"""
         return _html.HtmlPrintout_SetHtmlText(*args, **kwargs)
     def SetHtmlText(*args, **kwargs):
         """SetHtmlText(self, String html, String basepath=EmptyString, bool isdir=True)"""
         return _html.HtmlPrintout_SetHtmlText(*args, **kwargs)


@@ -1336,38 +1322,25 @@ class HtmlPrintout(_windows.Printout):
         return _html.HtmlPrintout_CleanUpStatics(*args, **kwargs)
 
     CleanUpStatics = staticmethod(CleanUpStatics)
         return _html.HtmlPrintout_CleanUpStatics(*args, **kwargs)
 
     CleanUpStatics = staticmethod(CleanUpStatics)

-
-class HtmlPrintoutPtr(HtmlPrintout):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = HtmlPrintout
-_html.HtmlPrintout_swigregister(HtmlPrintoutPtr)
+_html.HtmlPrintout_swigregister(HtmlPrintout)

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

-    """HtmlPrintout_AddFilter(wxHtmlFilter filter)"""
-    return _html.HtmlPrintout_AddFilter(*args, **kwargs)
+  """HtmlPrintout_AddFilter(wxHtmlFilter filter)"""
+  return _html.HtmlPrintout_AddFilter(*args, **kwargs)

 
 

-def HtmlPrintout_CleanUpStatics(*args, **kwargs):
-    """HtmlPrintout_CleanUpStatics()"""
-    return _html.HtmlPrintout_CleanUpStatics(*args, **kwargs)
+def HtmlPrintout_CleanUpStatics(*args):
+  """HtmlPrintout_CleanUpStatics()"""
+  return _html.HtmlPrintout_CleanUpStatics(*args)

 
 class HtmlEasyPrinting(_core.Object):
     """Proxy of C++ HtmlEasyPrinting class"""
 
 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):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 

         """__init__(self, String name=HtmlPrintingTitleStr, Window parentWindow=None) -> HtmlEasyPrinting"""
         """__init__(self, String name=HtmlPrintingTitleStr, Window parentWindow=None) -> HtmlEasyPrinting"""

-        newobj = _html.new_HtmlEasyPrinting(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-    def __del__(self, destroy=_html.delete_HtmlEasyPrinting):
-        """__del__(self)"""
-        try:
-            if self.thisown: destroy(self)
-        except: pass
-
+        _html.HtmlEasyPrinting_swiginit(self,_html.new_HtmlEasyPrinting(*args, **kwargs))
+    __swig_destroy__ = _html.delete_HtmlEasyPrinting
+    __del__ = lambda self : None;

     def PreviewFile(*args, **kwargs):
         """PreviewFile(self, String htmlfile)"""
         return _html.HtmlEasyPrinting_PreviewFile(*args, **kwargs)
     def PreviewFile(*args, **kwargs):
         """PreviewFile(self, String htmlfile)"""
         return _html.HtmlEasyPrinting_PreviewFile(*args, **kwargs)


@@ -1412,26 +1385,19 @@ class HtmlEasyPrinting(_core.Object):
         """GetPageSetupData(self) -> PageSetupDialogData"""
         return _html.HtmlEasyPrinting_GetPageSetupData(*args, **kwargs)
 
         """GetPageSetupData(self) -> PageSetupDialogData"""
         return _html.HtmlEasyPrinting_GetPageSetupData(*args, **kwargs)
 

-
-class HtmlEasyPrintingPtr(HtmlEasyPrinting):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = HtmlEasyPrinting
-_html.HtmlEasyPrinting_swigregister(HtmlEasyPrintingPtr)
+    PageSetupData = property(GetPageSetupData,doc="See `GetPageSetupData`") 
+    PrintData = property(GetPrintData,doc="See `GetPrintData`") 
+_html.HtmlEasyPrinting_swigregister(HtmlEasyPrinting)

 
 #---------------------------------------------------------------------------
 
 class HtmlBookRecord(object):
     """Proxy of C++ HtmlBookRecord class"""
 
 #---------------------------------------------------------------------------
 
 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):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 

         """__init__(self, String bookfile, String basepath, String title, String start) -> HtmlBookRecord"""
         """__init__(self, String bookfile, String basepath, String title, String start) -> HtmlBookRecord"""

-        newobj = _html.new_HtmlBookRecord(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _html.HtmlBookRecord_swiginit(self,_html.new_HtmlBookRecord(*args, **kwargs))

     def GetBookFile(*args, **kwargs):
         """GetBookFile(self) -> String"""
         return _html.HtmlBookRecord_GetBookFile(*args, **kwargs)
     def GetBookFile(*args, **kwargs):
         """GetBookFile(self) -> String"""
         return _html.HtmlBookRecord_GetBookFile(*args, **kwargs)


@@ -1476,52 +1442,20 @@ class HtmlBookRecord(object):
         """GetFullPath(self, String page) -> String"""
         return _html.HtmlBookRecord_GetFullPath(*args, **kwargs)
 
         """GetFullPath(self, String page) -> String"""
         return _html.HtmlBookRecord_GetFullPath(*args, **kwargs)
 

-
-class HtmlBookRecordPtr(HtmlBookRecord):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = HtmlBookRecord
-_html.HtmlBookRecord_swigregister(HtmlBookRecordPtr)
-
-class HtmlContentsItem(object):
-    """Proxy of C++ HtmlContentsItem class"""
-    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)
+    BasePath = property(GetBasePath,SetBasePath,doc="See `GetBasePath` and `SetBasePath`") 
+    BookFile = property(GetBookFile,doc="See `GetBookFile`") 
+    ContentsEnd = property(GetContentsEnd,doc="See `GetContentsEnd`") 
+    ContentsStart = property(GetContentsStart,doc="See `GetContentsStart`") 
+    FullPath = property(GetFullPath,doc="See `GetFullPath`") 
+    Start = property(GetStart,SetStart,doc="See `GetStart` and `SetStart`") 
+    Title = property(GetTitle,SetTitle,doc="See `GetTitle` and `SetTitle`") 
+_html.HtmlBookRecord_swigregister(HtmlBookRecord)

 
 class HtmlSearchStatus(object):
     """Proxy of C++ HtmlSearchStatus class"""
 
 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,)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    def __init__(self): raise AttributeError, "No constructor defined"
+    __repr__ = _swig_repr

     def Search(*args, **kwargs):
         """Search(self) -> bool"""
         return _html.HtmlSearchStatus_Search(*args, **kwargs)
     def Search(*args, **kwargs):
         """Search(self) -> bool"""
         return _html.HtmlSearchStatus_Search(*args, **kwargs)


@@ -1542,34 +1476,20 @@ 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):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = HtmlSearchStatus
-_html.HtmlSearchStatus_swigregister(HtmlSearchStatusPtr)
+    CurIndex = property(GetCurIndex,doc="See `GetCurIndex`") 
+    MaxIndex = property(GetMaxIndex,doc="See `GetMaxIndex`") 
+    Name = property(GetName,doc="See `GetName`") 
+_html.HtmlSearchStatus_swigregister(HtmlSearchStatus)

 
 class HtmlHelpData(object):
     """Proxy of C++ HtmlHelpData class"""
 
 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):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 

         """__init__(self) -> HtmlHelpData"""
         """__init__(self) -> HtmlHelpData"""

-        newobj = _html.new_HtmlHelpData(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-    def __del__(self, destroy=_html.delete_HtmlHelpData):
-        """__del__(self)"""
-        try:
-            if self.thisown: destroy(self)
-        except: pass
-
+        _html.HtmlHelpData_swiginit(self,_html.new_HtmlHelpData(*args, **kwargs))
+    __swig_destroy__ = _html.delete_HtmlHelpData
+    __del__ = lambda self : None;

     def SetTempDir(*args, **kwargs):
         """SetTempDir(self, String path)"""
         return _html.HtmlHelpData_SetTempDir(*args, **kwargs)
     def SetTempDir(*args, **kwargs):
         """SetTempDir(self, String path)"""
         return _html.HtmlHelpData_SetTempDir(*args, **kwargs)


@@ -1590,45 +1510,233 @@ 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)
+    BookRecArray = property(GetBookRecArray,doc="See `GetBookRecArray`") 
+_html.HtmlHelpData_swigregister(HtmlHelpData)

 
 

-    def GetContentsCnt(*args, **kwargs):
-        """GetContentsCnt(self) -> int"""
-        return _html.HtmlHelpData_GetContentsCnt(*args, **kwargs)
+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"""
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
+        """
+        __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
+        """
+        _html.HtmlHelpWindow_swiginit(self,_html.new_HtmlHelpWindow(*args, **kwargs))
+        self._setOORInfo(self)

 
 

-    def GetIndex(*args, **kwargs):
-        """GetIndex(self) -> HtmlContentsItem"""
-        return _html.HtmlHelpData_GetIndex(*args, **kwargs)
+    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"""
+        return _html.HtmlHelpWindow_GetData(*args, **kwargs)

 
 

-    def GetIndexCnt(*args, **kwargs):
-        """GetIndexCnt(self) -> int"""
-        return _html.HtmlHelpData_GetIndexCnt(*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)

 
 

-class HtmlHelpDataPtr(HtmlHelpData):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = HtmlHelpData
-_html.HtmlHelpData_swigregister(HtmlHelpDataPtr)
+    def Display(*args, **kwargs):
+        """Display(self, String x) -> bool"""
+        return _html.HtmlHelpWindow_Display(*args, **kwargs)
+
+    def DisplayID(*args, **kwargs):
+        """DisplayID(self, int id) -> bool"""
+        return _html.HtmlHelpWindow_DisplayID(*args, **kwargs)
+
+    def DisplayContents(*args, **kwargs):
+        """DisplayContents(self) -> bool"""
+        return _html.HtmlHelpWindow_DisplayContents(*args, **kwargs)
+
+    def DisplayIndex(*args, **kwargs):
+        """DisplayIndex(self) -> bool"""
+        return _html.HtmlHelpWindow_DisplayIndex(*args, **kwargs)
+
+    def KeywordSearch(*args, **kwargs):
+        """KeywordSearch(self, String keyword, wxHelpSearchMode mode=wxHELP_SEARCH_ALL) -> bool"""
+        return _html.HtmlHelpWindow_KeywordSearch(*args, **kwargs)
+
+    def UseConfig(*args, **kwargs):
+        """UseConfig(self, ConfigBase config, String rootpath=wxEmptyString)"""
+        return _html.HtmlHelpWindow_UseConfig(*args, **kwargs)
+
+    def ReadCustomization(*args, **kwargs):
+        """ReadCustomization(self, ConfigBase cfg, String path=wxEmptyString)"""
+        return _html.HtmlHelpWindow_ReadCustomization(*args, **kwargs)
+
+    def 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) -> HtmlWindow"""
+        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) -> wxPyTreeCtrl"""
+        return _html.HtmlHelpWindow_GetTreeCtrl(*args, **kwargs)
+
+    CfgData = property(GetCfgData,doc="See `GetCfgData`") 
+    Controller = property(GetController,SetController,doc="See `GetController` and `SetController`") 
+    Data = property(GetData,doc="See `GetData`") 
+    HtmlWindow = property(GetHtmlWindow,doc="See `GetHtmlWindow`") 
+    SplitterWindow = property(GetSplitterWindow,doc="See `GetSplitterWindow`") 
+    ToolBar = property(GetToolBar,doc="See `GetToolBar`") 
+    TreeCtrl = property(GetTreeCtrl,doc="See `GetTreeCtrl`") 
+_html.HtmlHelpWindow_swigregister(HtmlHelpWindow)
+
+def PreHtmlHelpWindow(*args, **kwargs):
+    """PreHtmlHelpWindow(HtmlHelpData data=None) -> HtmlHelpWindow"""
+    val = _html.new_PreHtmlHelpWindow(*args, **kwargs)
+    self._setOORInfo(self)
+    return val
+
+wxEVT_COMMAND_HTML_CELL_CLICKED = _html.wxEVT_COMMAND_HTML_CELL_CLICKED
+wxEVT_COMMAND_HTML_CELL_HOVER = _html.wxEVT_COMMAND_HTML_CELL_HOVER
+wxEVT_COMMAND_HTML_LINK_CLICKED = _html.wxEVT_COMMAND_HTML_LINK_CLICKED
+class HtmlCellEvent(_core.CommandEvent):
+    """Proxy of C++ HtmlCellEvent class"""
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
+        """
+        __init__(self, EventType commandType, int id, HtmlCell cell, Point pt, 
+            MouseEvent ev) -> HtmlCellEvent
+        """
+        _html.HtmlCellEvent_swiginit(self,_html.new_HtmlCellEvent(*args, **kwargs))
+    def GetCell(*args, **kwargs):
+        """GetCell(self) -> HtmlCell"""
+        return _html.HtmlCellEvent_GetCell(*args, **kwargs)
+
+    def GetPoint(*args, **kwargs):
+        """GetPoint(self) -> Point"""
+        return _html.HtmlCellEvent_GetPoint(*args, **kwargs)
+
+    def GetMouseEvent(*args, **kwargs):
+        """GetMouseEvent(self) -> MouseEvent"""
+        return _html.HtmlCellEvent_GetMouseEvent(*args, **kwargs)
+
+    def SetLinkClicked(*args, **kwargs):
+        """SetLinkClicked(self, bool linkclicked)"""
+        return _html.HtmlCellEvent_SetLinkClicked(*args, **kwargs)
+
+    def GetLinkClicked(*args, **kwargs):
+        """GetLinkClicked(self) -> bool"""
+        return _html.HtmlCellEvent_GetLinkClicked(*args, **kwargs)
+
+_html.HtmlCellEvent_swigregister(HtmlCellEvent)
+
+class HtmlLinkEvent(_core.CommandEvent):
+    """Proxy of C++ HtmlLinkEvent class"""
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
+        """__init__(self, int id, HtmlLinkInfo linkinfo) -> HtmlLinkEvent"""
+        _html.HtmlLinkEvent_swiginit(self,_html.new_HtmlLinkEvent(*args, **kwargs))
+    def GetLinkInfo(*args, **kwargs):
+        """GetLinkInfo(self) -> HtmlLinkInfo"""
+        return _html.HtmlLinkEvent_GetLinkInfo(*args, **kwargs)
+
+_html.HtmlLinkEvent_swigregister(HtmlLinkEvent)
+
+EVT_HTML_CELL_CLICKED = wx.PyEventBinder( wxEVT_COMMAND_HTML_CELL_CLICKED, 1 )
+EVT_HTML_CELL_HOVER   = wx.PyEventBinder( wxEVT_COMMAND_HTML_CELL_HOVER, 1 )
+EVT_HTML_LINK_CLICKED = wx.PyEventBinder( wxEVT_COMMAND_HTML_LINK_CLICKED, 1 )

 
 class HtmlHelpFrame(_windows.Frame):
     """Proxy of C++ HtmlHelpFrame class"""
 
 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):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    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 ?, String title=EmptyString, int style=wxHF_DEFAULTSTYLE, 
+            HtmlHelpData data=None, 
+            ConfigBase config=None, String rootpath=EmptyString) -> HtmlHelpFrame

         """
         """

-        newobj = _html.new_HtmlHelpFrame(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _html.HtmlHelpFrame_swiginit(self,_html.new_HtmlHelpFrame(*args, **kwargs))

         self._setOORInfo(self)
 
         self._setOORInfo(self)
 

+    def Create(*args, **kwargs):
+        """
+        Create(self, Window parent, int id, String title=EmptyString, int style=HF_DEFAULT_STYLE, 
+            ConfigBase config=None, 
+            String rootpath=EmptyString) -> bool
+        """
+        return _html.HtmlHelpFrame_Create(*args, **kwargs)
+

     def GetData(*args, **kwargs):
         """GetData(self) -> HtmlHelpData"""
         return _html.HtmlHelpFrame_GetData(*args, **kwargs)
     def GetData(*args, **kwargs):
         """GetData(self) -> HtmlHelpData"""
         return _html.HtmlHelpFrame_GetData(*args, **kwargs)


@@ -1637,70 +1745,201 @@ class HtmlHelpFrame(_windows.Frame):
         """SetTitleFormat(self, String format)"""
         return _html.HtmlHelpFrame_SetTitleFormat(*args, **kwargs)
 
         """SetTitleFormat(self, String format)"""
         return _html.HtmlHelpFrame_SetTitleFormat(*args, **kwargs)
 

-    def Display(*args, **kwargs):
-        """Display(self, String x)"""
-        return _html.HtmlHelpFrame_Display(*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)
+
+    Controller = property(GetController,SetController,doc="See `GetController` and `SetController`") 
+    Data = property(GetData,doc="See `GetData`") 
+    HelpWindow = property(GetHelpWindow,doc="See `GetHelpWindow`") 
+_html.HtmlHelpFrame_swigregister(HtmlHelpFrame)
+
+def PreHtmlHelpFrame(*args, **kwargs):
+    """PreHtmlHelpFrame(HtmlHelpData data=None) -> HtmlHelpFrame"""
+    val = _html.new_PreHtmlHelpFrame(*args, **kwargs)
+    self._setOORInfo(self)
+    return val

 
 

-    def DisplayID(*args, **kwargs):
-        """DisplayID(self, int id)"""
-        return _html.HtmlHelpFrame_DisplayID(*args, **kwargs)
+class HtmlHelpDialog(_windows.Dialog):
+    """Proxy of C++ HtmlHelpDialog class"""
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
+        """
+        __init__(self, Window parent, int ?, String title=EmptyString, int style=HF_DEFAULT_STYLE, 
+            HtmlHelpData data=None) -> HtmlHelpDialog
+        """
+        _html.HtmlHelpDialog_swiginit(self,_html.new_HtmlHelpDialog(*args, **kwargs))
+        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)
+
+    Controller = property(GetController,SetController,doc="See `GetController` and `SetController`") 
+    Data = property(GetData,doc="See `GetData`") 
+    HelpWindow = property(GetHelpWindow,doc="See `GetHelpWindow`") 
+_html.HtmlHelpDialog_swigregister(HtmlHelpDialog)
+
+def PreHtmlHelpDialog(*args, **kwargs):
+    """PreHtmlHelpDialog(HtmlHelpData data=None) -> HtmlHelpDialog"""
+    val = _html.new_PreHtmlHelpDialog(*args, **kwargs)
+    self._setOORInfo(self)
+    return val
+
+class HelpControllerBase(_core.Object):
+    """Proxy of C++ HelpControllerBase class"""
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    def __init__(self): raise AttributeError, "No constructor defined"
+    __repr__ = _swig_repr
+    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):
 
     def DisplayContents(*args, **kwargs):

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

 
 

-    def DisplayIndex(*args, **kwargs):
-        """DisplayIndex(self)"""
-        return _html.HtmlHelpFrame_DisplayIndex(*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):
 
     def KeywordSearch(*args, **kwargs):

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

 
 

-    def UseConfig(*args, **kwargs):
-        """UseConfig(self, ConfigBase config, String rootpath=EmptyString)"""
-        return _html.HtmlHelpFrame_UseConfig(*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 ReadCustomization(*args, **kwargs):
-        """ReadCustomization(self, ConfigBase cfg, String path=EmptyString)"""
-        return _html.HtmlHelpFrame_ReadCustomization(*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 WriteCustomization(*args, **kwargs):
-        """WriteCustomization(self, ConfigBase cfg, String path=EmptyString)"""
-        return _html.HtmlHelpFrame_WriteCustomization(*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)

 
 

-class HtmlHelpFramePtr(HtmlHelpFrame):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = HtmlHelpFrame
-_html.HtmlHelpFrame_swigregister(HtmlHelpFramePtr)
+    def SetParentWindow(*args, **kwargs):
+        """SetParentWindow(self, Window win)"""
+        return _html.HelpControllerBase_SetParentWindow(*args, **kwargs)

 
 

-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.Object):
+    def GetParentWindow(*args, **kwargs):
+        """GetParentWindow(self) -> Window"""
+        return _html.HelpControllerBase_GetParentWindow(*args, **kwargs)
+
+    ParentWindow = property(GetParentWindow,SetParentWindow,doc="See `GetParentWindow` and `SetParentWindow`") 
+_html.HelpControllerBase_swigregister(HelpControllerBase)
+
+class HtmlHelpController(HelpControllerBase):

     """Proxy of C++ HtmlHelpController class"""
     """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_DEFAULTSTYLE) -> 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
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
+        """__init__(self, int style=HF_DEFAULT_STYLE, Window parentWindow=None) -> HtmlHelpController"""
+        _html.HtmlHelpController_swiginit(self,_html.new_HtmlHelpController(*args, **kwargs))
+    __swig_destroy__ = _html.delete_HtmlHelpController
+    __del__ = lambda self : None;
+    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)"""
 
     def SetTitleFormat(*args, **kwargs):
         """SetTitleFormat(self, String format)"""


@@ -1746,16 +1985,30 @@ class HtmlHelpController(_core.Object):
         """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)
+
+    Dialog = property(GetDialog,doc="See `GetDialog`") 
+    Frame = property(GetFrame,doc="See `GetFrame`") 
+    HelpWindow = property(GetHelpWindow,SetHelpWindow,doc="See `GetHelpWindow` and `SetHelpWindow`") 
+_html.HtmlHelpController_swigregister(HtmlHelpController)

 
 

+class HtmlModalHelp(object):
+    """Proxy of C++ HtmlModalHelp class"""
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
+        """
+        __init__(self, Window parent, String helpFile, String topic=wxEmptyString, 
+            int style=wxHF_DEFAULT_STYLE|wxHF_DIALOG|wxHF_MODAL) -> HtmlModalHelp
+        """
+        _html.HtmlModalHelp_swiginit(self,_html.new_HtmlModalHelp(*args, **kwargs))
+_html.HtmlModalHelp_swigregister(HtmlModalHelp)

 
 

-class HtmlHelpControllerPtr(HtmlHelpController):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = HtmlHelpController
-_html.HtmlHelpController_swigregister(HtmlHelpControllerPtr)