fix building/running of tex2rtf

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

diff --git a/wxPython/src/gtk/html.py b/wxPython/src/gtk/html.py
index ac71f5126c443b7d0aee754332761282d37c4972..d7fbfda36b9cf0db0b1f656e409d73e59103bd48 100644 (file)
--- a/wxPython/src/gtk/html.py
+++ b/wxPython/src/gtk/html.py
@@ -80,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


@@ -128,8 +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)
 

-HtmlLinkInfo_swigregister = _html.HtmlLinkInfo_swigregister
-HtmlLinkInfo_swigregister(HtmlLinkInfo)
+    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


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

-HtmlTag_swigregister = _html.HtmlTag_swigregister
-HtmlTag_swigregister(HtmlTag)
+    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"""


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

-HtmlParser_swigregister = _html.HtmlParser_swigregister
-HtmlParser_swigregister(HtmlParser)
+    def GetInnerSource(*args, **kwargs):
+        """GetInnerSource(self, HtmlTag tag) -> String"""
+        return _html.HtmlParser_GetInnerSource(*args, **kwargs)
+
+    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"""


@@ -254,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)


@@ -357,8 +367,22 @@ class HtmlWinParser(HtmlParser):
         """GetLink(self) -> HtmlLinkInfo"""
         return _html.HtmlWinParser_GetLink(*args, **kwargs)
 
         """GetLink(self) -> HtmlLinkInfo"""
         return _html.HtmlWinParser_GetLink(*args, **kwargs)
 

-HtmlWinParser_swigregister = _html.HtmlWinParser_swigregister
-HtmlWinParser_swigregister(HtmlWinParser)
+    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"""


@@ -367,7 +391,7 @@ class HtmlTagHandler(_core.Object):
     def __init__(self, *args, **kwargs): 
         """__init__(self) -> HtmlTagHandler"""
         _html.HtmlTagHandler_swiginit(self,_html.new_HtmlTagHandler(*args, **kwargs))
     def __init__(self, *args, **kwargs): 
         """__init__(self) -> HtmlTagHandler"""
         _html.HtmlTagHandler_swiginit(self,_html.new_HtmlTagHandler(*args, **kwargs))

-        self._setCallbackInfo(self, HtmlTagHandler)
+        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)"""


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

-HtmlTagHandler_swigregister = _html.HtmlTagHandler_swigregister
-HtmlTagHandler_swigregister(HtmlTagHandler)
+    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"""


@@ -395,7 +419,7 @@ class HtmlWinTagHandler(HtmlTagHandler):
     def __init__(self, *args, **kwargs): 
         """__init__(self) -> HtmlWinTagHandler"""
         _html.HtmlWinTagHandler_swiginit(self,_html.new_HtmlWinTagHandler(*args, **kwargs))
     def __init__(self, *args, **kwargs): 
         """__init__(self) -> HtmlWinTagHandler"""
         _html.HtmlWinTagHandler_swiginit(self,_html.new_HtmlWinTagHandler(*args, **kwargs))

-        self._setCallbackInfo(self, HtmlWinTagHandler)
+        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)"""


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

-HtmlWinTagHandler_swigregister = _html.HtmlWinTagHandler_swigregister
-HtmlWinTagHandler_swigregister(HtmlWinTagHandler)
+    Parser = property(GetParser,SetParser,doc="See `GetParser` and `SetParser`") 
+_html.HtmlWinTagHandler_swigregister(HtmlWinTagHandler)

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


@@ -479,8 +503,13 @@ class HtmlSelection(object):
         """IsEmpty(self) -> bool"""
         return _html.HtmlSelection_IsEmpty(*args, **kwargs)
 
         """IsEmpty(self) -> bool"""
         return _html.HtmlSelection_IsEmpty(*args, **kwargs)
 

-HtmlSelection_swigregister = _html.HtmlSelection_swigregister
-HtmlSelection_swigregister(HtmlSelection)
+    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_OUT = _html.HTML_SEL_OUT
 HTML_SEL_IN = _html.HTML_SEL_IN


@@ -518,8 +547,10 @@ class HtmlRenderingState(object):
         """GetBgColour(self) -> Colour"""
         return _html.HtmlRenderingState_GetBgColour(*args, **kwargs)
 
         """GetBgColour(self) -> Colour"""
         return _html.HtmlRenderingState_GetBgColour(*args, **kwargs)
 

-HtmlRenderingState_swigregister = _html.HtmlRenderingState_swigregister
-HtmlRenderingState_swigregister(HtmlRenderingState)
+    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"""


@@ -534,16 +565,16 @@ 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)
 

-HtmlRenderingStyle_swigregister = _html.HtmlRenderingStyle_swigregister
-HtmlRenderingStyle_swigregister(HtmlRenderingStyle)
+    SelectedTextBgColour = property(GetSelectedTextBgColour,doc="See `GetSelectedTextBgColour`") 
+    SelectedTextColour = property(GetSelectedTextColour,doc="See `GetSelectedTextColour`") 
+_html.HtmlRenderingStyle_swigregister(HtmlRenderingStyle)

 
 class DefaultHtmlRenderingStyle(HtmlRenderingStyle):
     """Proxy of C++ DefaultHtmlRenderingStyle 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
 
 class DefaultHtmlRenderingStyle(HtmlRenderingStyle):
     """Proxy of C++ DefaultHtmlRenderingStyle 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

-DefaultHtmlRenderingStyle_swigregister = _html.DefaultHtmlRenderingStyle_swigregister
-DefaultHtmlRenderingStyle_swigregister(DefaultHtmlRenderingStyle)
+_html.DefaultHtmlRenderingStyle_swigregister(DefaultHtmlRenderingStyle)

 
 class HtmlRenderingInfo(object):
     """Proxy of C++ HtmlRenderingInfo class"""
 
 class HtmlRenderingInfo(object):
     """Proxy of C++ HtmlRenderingInfo class"""


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

-HtmlRenderingInfo_swigregister = _html.HtmlRenderingInfo_swigregister
-HtmlRenderingInfo_swigregister(HtmlRenderingInfo)
+    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)

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


@@ -639,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)


@@ -679,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)"""


@@ -700,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)


@@ -723,8 +765,24 @@ 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)
 

-HtmlCell_swigregister = _html.HtmlCell_swigregister
-HtmlCell_swigregister(HtmlCell)
+    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"""


@@ -745,8 +803,7 @@ class HtmlWordCell(HtmlCell):
         """SetPreviousWord(self, HtmlWordCell cell)"""
         return _html.HtmlWordCell_SetPreviousWord(*args, **kwargs)
 
         """SetPreviousWord(self, HtmlWordCell cell)"""
         return _html.HtmlWordCell_SetPreviousWord(*args, **kwargs)
 

-HtmlWordCell_swigregister = _html.HtmlWordCell_swigregister
-HtmlWordCell_swigregister(HtmlWordCell)
+_html.HtmlWordCell_swigregister(HtmlWordCell)

 
 class HtmlContainerCell(HtmlCell):
     """Proxy of C++ HtmlContainerCell class"""
 
 class HtmlContainerCell(HtmlCell):
     """Proxy of C++ HtmlContainerCell class"""


@@ -819,8 +876,13 @@ class HtmlContainerCell(HtmlCell):
         """GetFirstChild(self) -> HtmlCell"""
         return _html.HtmlContainerCell_GetFirstChild(*args, **kwargs)
 
         """GetFirstChild(self) -> HtmlCell"""
         return _html.HtmlContainerCell_GetFirstChild(*args, **kwargs)
 

-HtmlContainerCell_swigregister = _html.HtmlContainerCell_swigregister
-HtmlContainerCell_swigregister(HtmlContainerCell)
+    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"""


@@ -829,8 +891,7 @@ class HtmlColourCell(HtmlCell):
     def __init__(self, *args, **kwargs): 
         """__init__(self, Colour clr, int flags=HTML_CLR_FOREGROUND) -> HtmlColourCell"""
         _html.HtmlColourCell_swiginit(self,_html.new_HtmlColourCell(*args, **kwargs))
     def __init__(self, *args, **kwargs): 
         """__init__(self, Colour clr, int flags=HTML_CLR_FOREGROUND) -> HtmlColourCell"""
         _html.HtmlColourCell_swiginit(self,_html.new_HtmlColourCell(*args, **kwargs))

-HtmlColourCell_swigregister = _html.HtmlColourCell_swigregister
-HtmlColourCell_swigregister(HtmlColourCell)
+_html.HtmlColourCell_swigregister(HtmlColourCell)

 
 class HtmlFontCell(HtmlCell):
     """Proxy of C++ HtmlFontCell class"""
 
 class HtmlFontCell(HtmlCell):
     """Proxy of C++ HtmlFontCell class"""


@@ -839,8 +900,7 @@ class HtmlFontCell(HtmlCell):
     def __init__(self, *args, **kwargs): 
         """__init__(self, Font font) -> HtmlFontCell"""
         _html.HtmlFontCell_swiginit(self,_html.new_HtmlFontCell(*args, **kwargs))
     def __init__(self, *args, **kwargs): 
         """__init__(self, Font font) -> HtmlFontCell"""
         _html.HtmlFontCell_swiginit(self,_html.new_HtmlFontCell(*args, **kwargs))

-HtmlFontCell_swigregister = _html.HtmlFontCell_swigregister
-HtmlFontCell_swigregister(HtmlFontCell)
+_html.HtmlFontCell_swigregister(HtmlFontCell)

 
 class HtmlWidgetCell(HtmlCell):
     """Proxy of C++ HtmlWidgetCell class"""
 
 class HtmlWidgetCell(HtmlCell):
     """Proxy of C++ HtmlWidgetCell class"""


@@ -849,8 +909,7 @@ class HtmlWidgetCell(HtmlCell):
     def __init__(self, *args, **kwargs): 
         """__init__(self, Window wnd, int w=0) -> HtmlWidgetCell"""
         _html.HtmlWidgetCell_swiginit(self,_html.new_HtmlWidgetCell(*args, **kwargs))
     def __init__(self, *args, **kwargs): 
         """__init__(self, Window wnd, int w=0) -> HtmlWidgetCell"""
         _html.HtmlWidgetCell_swiginit(self,_html.new_HtmlWidgetCell(*args, **kwargs))

-HtmlWidgetCell_swigregister = _html.HtmlWidgetCell_swigregister
-HtmlWidgetCell_swigregister(HtmlWidgetCell)
+_html.HtmlWidgetCell_swigregister(HtmlWidgetCell)

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


@@ -861,14 +920,55 @@ class HtmlFilter(_core.Object):
     def __init__(self, *args, **kwargs): 
         """__init__(self) -> HtmlFilter"""
         _html.HtmlFilter_swiginit(self,_html.new_HtmlFilter(*args, **kwargs))
     def __init__(self, *args, **kwargs): 
         """__init__(self) -> HtmlFilter"""
         _html.HtmlFilter_swiginit(self,_html.new_HtmlFilter(*args, **kwargs))

-        self._setCallbackInfo(self, HtmlFilter)
+        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)
 

-HtmlFilter_swigregister = _html.HtmlFilter_swigregister
-HtmlFilter_swigregister(HtmlFilter)
+_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)

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


@@ -883,7 +983,7 @@ class HtmlWindow(_windows.ScrolledWindow):
             String name=HtmlWindowNameStr) -> HtmlWindow
         """
         _html.HtmlWindow_swiginit(self,_html.new_HtmlWindow(*args, **kwargs))
             String name=HtmlWindowNameStr) -> HtmlWindow
         """
         _html.HtmlWindow_swiginit(self,_html.new_HtmlWindow(*args, **kwargs))

-        self._setCallbackInfo(self, HtmlWindow); self._setOORInfo(self)
+        self._setOORInfo(self);HtmlWindow._setCallbackInfo(self, self, HtmlWindow)

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


@@ -1035,9 +1135,13 @@ class HtmlWindow(_windows.ScrolledWindow):
         return _html.HtmlWindow_OnCellMouseHover(*args, **kwargs)
 
     def OnCellClicked(*args, **kwargs):
         return _html.HtmlWindow_OnCellMouseHover(*args, **kwargs)
 
     def OnCellClicked(*args, **kwargs):

-        """OnCellClicked(self, HtmlCell cell, int x, int y, MouseEvent event)"""
+        """OnCellClicked(self, HtmlCell cell, int x, int y, MouseEvent event) -> bool"""

         return _html.HtmlWindow_OnCellClicked(*args, **kwargs)
 
         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_OnLinkClicked(*args, **kw):
         return HtmlWindow.OnLinkClicked(*args, **kw)
     base_OnLinkClicked = wx._deprecated(base_OnLinkClicked,
     def base_OnLinkClicked(*args, **kw):
         return HtmlWindow.OnLinkClicked(*args, **kw)
     base_OnLinkClicked = wx._deprecated(base_OnLinkClicked,


@@ -1076,8 +1180,21 @@ class HtmlWindow(_windows.ScrolledWindow):
         return _html.HtmlWindow_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
         return _html.HtmlWindow_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)

-HtmlWindow_swigregister = _html.HtmlWindow_swigregister
-HtmlWindow_swigregister(HtmlWindow)
+    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"""
 
 def PreHtmlWindow(*args, **kwargs):
     """PreHtmlWindow() -> HtmlWindow"""


@@ -1105,6 +1222,10 @@ def HtmlWindow_GetClassDefaultAttributes(*args, **kwargs):
     """
   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):
 #---------------------------------------------------------------------------
 
 class HtmlDCRenderer(_core.Object):


@@ -1138,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)
 


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

-HtmlDCRenderer_swigregister = _html.HtmlDCRenderer_swigregister
-HtmlDCRenderer_swigregister(HtmlDCRenderer)
+    TotalHeight = property(GetTotalHeight,doc="See `GetTotalHeight`") 
+_html.HtmlDCRenderer_swigregister(HtmlDCRenderer)

 
 PAGE_ODD = _html.PAGE_ODD
 PAGE_EVEN = _html.PAGE_EVEN
 
 PAGE_ODD = _html.PAGE_ODD
 PAGE_EVEN = _html.PAGE_EVEN


@@ -1201,8 +1322,7 @@ class HtmlPrintout(_windows.Printout):
         return _html.HtmlPrintout_CleanUpStatics(*args, **kwargs)
 
     CleanUpStatics = staticmethod(CleanUpStatics)
         return _html.HtmlPrintout_CleanUpStatics(*args, **kwargs)
 
     CleanUpStatics = staticmethod(CleanUpStatics)

-HtmlPrintout_swigregister = _html.HtmlPrintout_swigregister
-HtmlPrintout_swigregister(HtmlPrintout)
+_html.HtmlPrintout_swigregister(HtmlPrintout)

 
 def HtmlPrintout_AddFilter(*args, **kwargs):
   """HtmlPrintout_AddFilter(wxHtmlFilter filter)"""
 
 def HtmlPrintout_AddFilter(*args, **kwargs):
   """HtmlPrintout_AddFilter(wxHtmlFilter filter)"""


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

-HtmlEasyPrinting_swigregister = _html.HtmlEasyPrinting_swigregister
-HtmlEasyPrinting_swigregister(HtmlEasyPrinting)
+    PageSetupData = property(GetPageSetupData,doc="See `GetPageSetupData`") 
+    PrintData = property(GetPrintData,doc="See `GetPrintData`") 
+_html.HtmlEasyPrinting_swigregister(HtmlEasyPrinting)

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


@@ -1321,8 +1442,14 @@ 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)
 

-HtmlBookRecord_swigregister = _html.HtmlBookRecord_swigregister
-HtmlBookRecord_swigregister(HtmlBookRecord)
+    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"""


@@ -1349,8 +1476,10 @@ class HtmlSearchStatus(object):
         """GetName(self) -> String"""
         return _html.HtmlSearchStatus_GetName(*args, **kwargs)
 
         """GetName(self) -> String"""
         return _html.HtmlSearchStatus_GetName(*args, **kwargs)
 

-HtmlSearchStatus_swigregister = _html.HtmlSearchStatus_swigregister
-HtmlSearchStatus_swigregister(HtmlSearchStatus)
+    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"""


@@ -1381,8 +1510,8 @@ class HtmlHelpData(object):
         """GetBookRecArray(self) -> wxHtmlBookRecArray"""
         return _html.HtmlHelpData_GetBookRecArray(*args, **kwargs)
 
         """GetBookRecArray(self) -> wxHtmlBookRecArray"""
         return _html.HtmlHelpData_GetBookRecArray(*args, **kwargs)
 

-HtmlHelpData_swigregister = _html.HtmlHelpData_swigregister
-HtmlHelpData_swigregister(HtmlHelpData)
+    BookRecArray = property(GetBookRecArray,doc="See `GetBookRecArray`") 
+_html.HtmlHelpData_swigregister(HtmlHelpData)

 
 HF_TOOLBAR = _html.HF_TOOLBAR
 HF_CONTENTS = _html.HF_CONTENTS
 
 HF_TOOLBAR = _html.HF_TOOLBAR
 HF_CONTENTS = _html.HF_CONTENTS


@@ -1501,7 +1630,7 @@ class HtmlHelpWindow(_core.Window):
         return _html.HtmlHelpWindow_RefreshLists(*args, **kwargs)
 
     def GetHtmlWindow(*args, **kwargs):
         return _html.HtmlHelpWindow_RefreshLists(*args, **kwargs)
 
     def GetHtmlWindow(*args, **kwargs):

-        """GetHtmlWindow(self) -> wxHtmlWindow"""
+        """GetHtmlWindow(self) -> HtmlWindow"""

         return _html.HtmlHelpWindow_GetHtmlWindow(*args, **kwargs)
 
     def GetSplitterWindow(*args, **kwargs):
         return _html.HtmlHelpWindow_GetHtmlWindow(*args, **kwargs)
 
     def GetSplitterWindow(*args, **kwargs):


@@ -1517,11 +1646,17 @@ class HtmlHelpWindow(_core.Window):
         return _html.HtmlHelpWindow_GetCfgData(*args, **kwargs)
 
     def GetTreeCtrl(*args, **kwargs):
         return _html.HtmlHelpWindow_GetCfgData(*args, **kwargs)
 
     def GetTreeCtrl(*args, **kwargs):

-        """GetTreeCtrl(self) -> wxTreeCtrl"""
+        """GetTreeCtrl(self) -> wxPyTreeCtrl"""

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

-HtmlHelpWindow_swigregister = _html.HtmlHelpWindow_swigregister
-HtmlHelpWindow_swigregister(HtmlHelpWindow)
+    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"""
 
 def PreHtmlHelpWindow(*args, **kwargs):
     """PreHtmlHelpWindow(HtmlHelpData data=None) -> HtmlHelpWindow"""


@@ -1529,23 +1664,57 @@ def PreHtmlHelpWindow(*args, **kwargs):
     self._setOORInfo(self)
     return val
 
     self._setOORInfo(self)
     return val
 

-class HtmlWindowEvent(_core.NotifyEvent):
-    """Proxy of C++ HtmlWindowEvent class"""
+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): 
     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, wxEventType commandType=wxEVT_NULL, int id=0) -> HtmlWindowEvent"""
-        _html.HtmlWindowEvent_swiginit(self,_html.new_HtmlWindowEvent(*args, **kwargs))
-    def SetURL(*args, **kwargs):
-        """SetURL(self, String url)"""
-        return _html.HtmlWindowEvent_SetURL(*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)

 
 

-    def GetURL(*args, **kwargs):
-        """GetURL(self) -> String"""
-        return _html.HtmlWindowEvent_GetURL(*args, **kwargs)
+_html.HtmlLinkEvent_swigregister(HtmlLinkEvent)

 
 

-HtmlWindowEvent_swigregister = _html.HtmlWindowEvent_swigregister
-HtmlWindowEvent_swigregister(HtmlWindowEvent)
+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"""


@@ -1554,13 +1723,18 @@ class HtmlHelpFrame(_windows.Frame):
     def __init__(self, *args, **kwargs): 
         """
         __init__(self, Window parent, int ?, String title=EmptyString, int style=wxHF_DEFAULTSTYLE, 
     def __init__(self, *args, **kwargs): 
         """
         __init__(self, Window parent, int ?, String title=EmptyString, int style=wxHF_DEFAULTSTYLE, 

-            HtmlHelpData data=None) -> HtmlHelpFrame
+            HtmlHelpData data=None, 
+            ConfigBase config=None, String rootpath=EmptyString) -> HtmlHelpFrame

         """
         _html.HtmlHelpFrame_swiginit(self,_html.new_HtmlHelpFrame(*args, **kwargs))
         self._setOORInfo(self)
 
     def Create(*args, **kwargs):
         """
         _html.HtmlHelpFrame_swiginit(self,_html.new_HtmlHelpFrame(*args, **kwargs))
         self._setOORInfo(self)
 
     def Create(*args, **kwargs):

-        """Create(self, Window parent, int id, String title=EmptyString, int style=HF_DEFAULT_STYLE) -> bool"""
+        """
+        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):
         return _html.HtmlHelpFrame_Create(*args, **kwargs)
 
     def GetData(*args, **kwargs):


@@ -1599,7 +1773,7 @@ class HtmlHelpFrame(_windows.Frame):
 
     def KeywordSearch(self, keyword):
         return self.GetHelpWindow().KeywordSearch(keyword)
 
     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=""):
     def UseConfig(self, config, rootpath=""):
         return self.GetHelpWindow().UseConfig(config, rootpath)
     def ReadCustomization(self, config, rootpath=""):


@@ -1607,8 +1781,10 @@ class HtmlHelpFrame(_windows.Frame):
     def WriteCustomization(self, config, rootpath=""):
         return self.GetHelpWindow().WriteCustomization(config, rootpath)
 
     def WriteCustomization(self, config, rootpath=""):
         return self.GetHelpWindow().WriteCustomization(config, rootpath)
 

-HtmlHelpFrame_swigregister = _html.HtmlHelpFrame_swigregister
-HtmlHelpFrame_swigregister(HtmlHelpFrame)
+    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"""
 
 def PreHtmlHelpFrame(*args, **kwargs):
     """PreHtmlHelpFrame(HtmlHelpData data=None) -> HtmlHelpFrame"""


@@ -1652,8 +1828,10 @@ class HtmlHelpDialog(_windows.Dialog):
         """SetTitleFormat(self, String format)"""
         return _html.HtmlHelpDialog_SetTitleFormat(*args, **kwargs)
 
         """SetTitleFormat(self, String format)"""
         return _html.HtmlHelpDialog_SetTitleFormat(*args, **kwargs)
 

-HtmlHelpDialog_swigregister = _html.HtmlHelpDialog_swigregister
-HtmlHelpDialog_swigregister(HtmlHelpDialog)
+    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"""
 
 def PreHtmlHelpDialog(*args, **kwargs):
     """PreHtmlHelpDialog(HtmlHelpData data=None) -> HtmlHelpDialog"""


@@ -1735,8 +1913,8 @@ class HelpControllerBase(_core.Object):
         """GetParentWindow(self) -> Window"""
         return _html.HelpControllerBase_GetParentWindow(*args, **kwargs)
 
         """GetParentWindow(self) -> Window"""
         return _html.HelpControllerBase_GetParentWindow(*args, **kwargs)
 

-HelpControllerBase_swigregister = _html.HelpControllerBase_swigregister
-HelpControllerBase_swigregister(HelpControllerBase)
+    ParentWindow = property(GetParentWindow,SetParentWindow,doc="See `GetParentWindow` and `SetParentWindow`") 
+_html.HelpControllerBase_swigregister(HelpControllerBase)

 
 class HtmlHelpController(HelpControllerBase):
     """Proxy of C++ HtmlHelpController class"""
 
 class HtmlHelpController(HelpControllerBase):
     """Proxy of C++ HtmlHelpController class"""


@@ -1815,8 +1993,10 @@ class HtmlHelpController(HelpControllerBase):
         """FindTopLevelWindow(self) -> Window"""
         return _html.HtmlHelpController_FindTopLevelWindow(*args, **kwargs)
 
         """FindTopLevelWindow(self) -> Window"""
         return _html.HtmlHelpController_FindTopLevelWindow(*args, **kwargs)
 

-HtmlHelpController_swigregister = _html.HtmlHelpController_swigregister
-HtmlHelpController_swigregister(HtmlHelpController)
+    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"""
 
 class HtmlModalHelp(object):
     """Proxy of C++ HtmlModalHelp class"""


@@ -1828,8 +2008,7 @@ class HtmlModalHelp(object):
             int style=wxHF_DEFAULT_STYLE|wxHF_DIALOG|wxHF_MODAL) -> HtmlModalHelp
         """
         _html.HtmlModalHelp_swiginit(self,_html.new_HtmlModalHelp(*args, **kwargs))
             int style=wxHF_DEFAULT_STYLE|wxHF_DIALOG|wxHF_MODAL) -> HtmlModalHelp
         """
         _html.HtmlModalHelp_swiginit(self,_html.new_HtmlModalHelp(*args, **kwargs))

-HtmlModalHelp_swigregister = _html.HtmlModalHelp_swigregister
-HtmlModalHelp_swigregister(HtmlModalHelp)
+_html.HtmlModalHelp_swigregister(HtmlModalHelp)