Force integer values for positions and sizes

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

diff --git a/wxPython/src/mac/html.py b/wxPython/src/mac/html.py
index 452dae04c82e59c1b896c81d3c292d1d397141e2..603ae204c2aa0eddd6830ff82e17165afd0b99d1 100644 (file)
--- a/wxPython/src/mac/html.py
+++ b/wxPython/src/mac/html.py
@@ -27,6 +27,13 @@ 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


@@ -38,21 +45,20 @@ HTML_URL_PAGE = _html.HTML_URL_PAGE
 HTML_URL_IMAGE = _html.HTML_URL_IMAGE
 HTML_URL_OTHER = _html.HTML_URL_OTHER
 class HtmlLinkInfo(core.Object):
 HTML_URL_IMAGE = _html.HTML_URL_IMAGE
 HTML_URL_OTHER = _html.HTML_URL_OTHER
 class HtmlLinkInfo(core.Object):

-    """"""

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

-        """__init__(wxString href, wxString target=wxPyEmptyString) -> HtmlLinkInfo"""
+        """__init__(String href, String target=EmptyString) -> HtmlLinkInfo"""

         newobj = _html.new_HtmlLinkInfo(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def GetHref(*args, **kwargs):
         newobj = _html.new_HtmlLinkInfo(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def GetHref(*args, **kwargs):

-        """GetHref() -> wxString"""
+        """GetHref() -> String"""

         return _html.HtmlLinkInfo_GetHref(*args, **kwargs)
 
     def GetTarget(*args, **kwargs):
         return _html.HtmlLinkInfo_GetHref(*args, **kwargs)
 
     def GetTarget(*args, **kwargs):

-        """GetTarget() -> wxString"""
+        """GetTarget() -> String"""

         return _html.HtmlLinkInfo_GetTarget(*args, **kwargs)
 
     def GetEvent(*args, **kwargs):
         return _html.HtmlLinkInfo_GetTarget(*args, **kwargs)
 
     def GetEvent(*args, **kwargs):


@@ -78,26 +84,29 @@ class HtmlLinkInfoPtr(HtmlLinkInfo):
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = HtmlLinkInfo
 _html.HtmlLinkInfo_swigregister(HtmlLinkInfoPtr)
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = HtmlLinkInfo
 _html.HtmlLinkInfo_swigregister(HtmlLinkInfoPtr)

+cvar = _html.cvar
+HtmlWindowNameStr = cvar.HtmlWindowNameStr
+HtmlPrintoutTitleStr = cvar.HtmlPrintoutTitleStr
+HtmlPrintingTitleStr = cvar.HtmlPrintingTitleStr

 
 class HtmlTag(core.Object):
 
 class HtmlTag(core.Object):

-    """"""

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

-        """GetName() -> wxString"""
+        """GetName() -> String"""

         return _html.HtmlTag_GetName(*args, **kwargs)
 
     def HasParam(*args, **kwargs):
         return _html.HtmlTag_GetName(*args, **kwargs)
 
     def HasParam(*args, **kwargs):

-        """HasParam(wxString par) -> bool"""
+        """HasParam(String par) -> bool"""

         return _html.HtmlTag_HasParam(*args, **kwargs)
 
     def GetParam(*args, **kwargs):
         return _html.HtmlTag_HasParam(*args, **kwargs)
 
     def GetParam(*args, **kwargs):

-        """GetParam(wxString par, int with_commas=False) -> wxString"""
+        """GetParam(String par, int with_commas=False) -> String"""

         return _html.HtmlTag_GetParam(*args, **kwargs)
 
     def GetAllParams(*args, **kwargs):
         return _html.HtmlTag_GetParam(*args, **kwargs)
 
     def GetAllParams(*args, **kwargs):

-        """GetAllParams() -> wxString"""
+        """GetAllParams() -> String"""

         return _html.HtmlTag_GetAllParams(*args, **kwargs)
 
     def HasEnding(*args, **kwargs):
         return _html.HtmlTag_GetAllParams(*args, **kwargs)
 
     def HasEnding(*args, **kwargs):


@@ -125,7 +134,6 @@ class HtmlTagPtr(HtmlTag):
 _html.HtmlTag_swigregister(HtmlTagPtr)
 
 class HtmlParser(core.Object):
 _html.HtmlTag_swigregister(HtmlTagPtr)
 
 class HtmlParser(core.Object):

-    """"""

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


@@ -138,11 +146,11 @@ class HtmlParser(core.Object):
         return _html.HtmlParser_GetFS(*args, **kwargs)
 
     def Parse(*args, **kwargs):
         return _html.HtmlParser_GetFS(*args, **kwargs)
 
     def Parse(*args, **kwargs):

-        """Parse(wxString source) -> Object"""
+        """Parse(String source) -> Object"""

         return _html.HtmlParser_Parse(*args, **kwargs)
 
     def InitParser(*args, **kwargs):
         return _html.HtmlParser_Parse(*args, **kwargs)
 
     def InitParser(*args, **kwargs):

-        """InitParser(wxString source)"""
+        """InitParser(String source)"""

         return _html.HtmlParser_InitParser(*args, **kwargs)
 
     def DoneParser(*args, **kwargs):
         return _html.HtmlParser_InitParser(*args, **kwargs)
 
     def DoneParser(*args, **kwargs):


@@ -158,15 +166,15 @@ class HtmlParser(core.Object):
         return _html.HtmlParser_StopParsing(*args, **kwargs)
 
     def AddTagHandler(*args, **kwargs):
         return _html.HtmlParser_StopParsing(*args, **kwargs)
 
     def AddTagHandler(*args, **kwargs):

-        """AddTagHandler(wxHtmlTagHandler handler)"""
+        """AddTagHandler(HtmlTagHandler handler)"""

         return _html.HtmlParser_AddTagHandler(*args, **kwargs)
 
     def GetSource(*args, **kwargs):
         return _html.HtmlParser_AddTagHandler(*args, **kwargs)
 
     def GetSource(*args, **kwargs):

-        """GetSource() -> wxString"""
+        """GetSource() -> String"""

         return _html.HtmlParser_GetSource(*args, **kwargs)
 
     def PushTagHandler(*args, **kwargs):
         return _html.HtmlParser_GetSource(*args, **kwargs)
 
     def PushTagHandler(*args, **kwargs):

-        """PushTagHandler(wxHtmlTagHandler handler, wxString tags)"""
+        """PushTagHandler(HtmlTagHandler handler, String tags)"""

         return _html.HtmlParser_PushTagHandler(*args, **kwargs)
 
     def PopTagHandler(*args, **kwargs):
         return _html.HtmlParser_PushTagHandler(*args, **kwargs)
 
     def PopTagHandler(*args, **kwargs):


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

-    """"""

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


@@ -192,11 +199,11 @@ class HtmlWinParser(HtmlParser):
         self.thisown = 1
         del newobj.thisown
     def SetDC(*args, **kwargs):
         self.thisown = 1
         del newobj.thisown
     def SetDC(*args, **kwargs):

-        """SetDC(wxDC dc)"""
+        """SetDC(DC dc)"""

         return _html.HtmlWinParser_SetDC(*args, **kwargs)
 
     def GetDC(*args, **kwargs):
         return _html.HtmlWinParser_SetDC(*args, **kwargs)
 
     def GetDC(*args, **kwargs):

-        """GetDC() -> wxDC"""
+        """GetDC() -> DC"""

         return _html.HtmlWinParser_GetDC(*args, **kwargs)
 
     def GetCharHeight(*args, **kwargs):
         return _html.HtmlWinParser_GetDC(*args, **kwargs)
 
     def GetCharHeight(*args, **kwargs):


@@ -212,7 +219,7 @@ class HtmlWinParser(HtmlParser):
         return _html.HtmlWinParser_GetWindow(*args, **kwargs)
 
     def SetFonts(*args, **kwargs):
         return _html.HtmlWinParser_GetWindow(*args, **kwargs)
 
     def SetFonts(*args, **kwargs):

-        """SetFonts(wxString normal_face, wxString fixed_face, PyObject sizes=None)"""
+        """SetFonts(String normal_face, String fixed_face, PyObject sizes=None)"""

         return _html.HtmlWinParser_SetFonts(*args, **kwargs)
 
     def GetContainer(*args, **kwargs):
         return _html.HtmlWinParser_SetFonts(*args, **kwargs)
 
     def GetContainer(*args, **kwargs):


@@ -280,27 +287,27 @@ class HtmlWinParser(HtmlParser):
         return _html.HtmlWinParser_SetAlign(*args, **kwargs)
 
     def GetLinkColor(*args, **kwargs):
         return _html.HtmlWinParser_SetAlign(*args, **kwargs)
 
     def GetLinkColor(*args, **kwargs):

-        """GetLinkColor() -> wxColour"""
+        """GetLinkColor() -> Colour"""

         return _html.HtmlWinParser_GetLinkColor(*args, **kwargs)
 
     def SetLinkColor(*args, **kwargs):
         return _html.HtmlWinParser_GetLinkColor(*args, **kwargs)
 
     def SetLinkColor(*args, **kwargs):

-        """SetLinkColor(wxColour clr)"""
+        """SetLinkColor(Colour clr)"""

         return _html.HtmlWinParser_SetLinkColor(*args, **kwargs)
 
     def GetActualColor(*args, **kwargs):
         return _html.HtmlWinParser_SetLinkColor(*args, **kwargs)
 
     def GetActualColor(*args, **kwargs):

-        """GetActualColor() -> wxColour"""
+        """GetActualColor() -> Colour"""

         return _html.HtmlWinParser_GetActualColor(*args, **kwargs)
 
     def SetActualColor(*args, **kwargs):
         return _html.HtmlWinParser_GetActualColor(*args, **kwargs)
 
     def SetActualColor(*args, **kwargs):

-        """SetActualColor(wxColour clr)"""
+        """SetActualColor(Colour clr)"""

         return _html.HtmlWinParser_SetActualColor(*args, **kwargs)
 
     def SetLink(*args, **kwargs):
         return _html.HtmlWinParser_SetActualColor(*args, **kwargs)
 
     def SetLink(*args, **kwargs):

-        """SetLink(wxString link)"""
+        """SetLink(String link)"""

         return _html.HtmlWinParser_SetLink(*args, **kwargs)
 
     def CreateCurrentFont(*args, **kwargs):
         return _html.HtmlWinParser_SetLink(*args, **kwargs)
 
     def CreateCurrentFont(*args, **kwargs):

-        """CreateCurrentFont() -> wxFont"""
+        """CreateCurrentFont() -> Font"""

         return _html.HtmlWinParser_CreateCurrentFont(*args, **kwargs)
 
     def GetLink(*args, **kwargs):
         return _html.HtmlWinParser_CreateCurrentFont(*args, **kwargs)
 
     def GetLink(*args, **kwargs):


@@ -316,7 +323,6 @@ class HtmlWinParserPtr(HtmlWinParser):
 _html.HtmlWinParser_swigregister(HtmlWinParserPtr)
 
 class HtmlTagHandler(core.Object):
 _html.HtmlWinParser_swigregister(HtmlWinParserPtr)
 
 class HtmlTagHandler(core.Object):

-    """"""

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


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

-    """"""

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


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

-    """"""

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


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

-    """"""

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


@@ -485,27 +488,27 @@ class HtmlRenderingState(object):
         except: pass
 
     def SetSelectionState(*args, **kwargs):
         except: pass
 
     def SetSelectionState(*args, **kwargs):

-        """SetSelectionState(wxHtmlSelectionState s)"""
+        """SetSelectionState(int s)"""

         return _html.HtmlRenderingState_SetSelectionState(*args, **kwargs)
 
     def GetSelectionState(*args, **kwargs):
         return _html.HtmlRenderingState_SetSelectionState(*args, **kwargs)
 
     def GetSelectionState(*args, **kwargs):

-        """GetSelectionState() -> wxHtmlSelectionState"""
+        """GetSelectionState() -> int"""

         return _html.HtmlRenderingState_GetSelectionState(*args, **kwargs)
 
     def SetFgColour(*args, **kwargs):
         return _html.HtmlRenderingState_GetSelectionState(*args, **kwargs)
 
     def SetFgColour(*args, **kwargs):

-        """SetFgColour(wxColour c)"""
+        """SetFgColour(Colour c)"""

         return _html.HtmlRenderingState_SetFgColour(*args, **kwargs)
 
     def GetFgColour(*args, **kwargs):
         return _html.HtmlRenderingState_SetFgColour(*args, **kwargs)
 
     def GetFgColour(*args, **kwargs):

-        """GetFgColour() -> wxColour"""
+        """GetFgColour() -> Colour"""

         return _html.HtmlRenderingState_GetFgColour(*args, **kwargs)
 
     def SetBgColour(*args, **kwargs):
         return _html.HtmlRenderingState_GetFgColour(*args, **kwargs)
 
     def SetBgColour(*args, **kwargs):

-        """SetBgColour(wxColour c)"""
+        """SetBgColour(Colour c)"""

         return _html.HtmlRenderingState_SetBgColour(*args, **kwargs)
 
     def GetBgColour(*args, **kwargs):
         return _html.HtmlRenderingState_SetBgColour(*args, **kwargs)
 
     def GetBgColour(*args, **kwargs):

-        """GetBgColour() -> wxColour"""
+        """GetBgColour() -> Colour"""

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


@@ -517,16 +520,15 @@ class HtmlRenderingStatePtr(HtmlRenderingState):
 _html.HtmlRenderingState_swigregister(HtmlRenderingStatePtr)
 
 class HtmlRenderingStyle(object):
 _html.HtmlRenderingState_swigregister(HtmlRenderingStatePtr)
 
 class HtmlRenderingStyle(object):

-    """"""

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

-        """GetSelectedTextColour(wxColour clr) -> wxColour"""
+        """GetSelectedTextColour(Colour clr) -> Colour"""

         return _html.HtmlRenderingStyle_GetSelectedTextColour(*args, **kwargs)
 
     def GetSelectedTextBgColour(*args, **kwargs):
         return _html.HtmlRenderingStyle_GetSelectedTextColour(*args, **kwargs)
 
     def GetSelectedTextBgColour(*args, **kwargs):

-        """GetSelectedTextBgColour(wxColour clr) -> wxColour"""
+        """GetSelectedTextBgColour(Colour clr) -> Colour"""

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


@@ -538,16 +540,15 @@ class HtmlRenderingStylePtr(HtmlRenderingStyle):
 _html.HtmlRenderingStyle_swigregister(HtmlRenderingStylePtr)
 
 class DefaultHtmlRenderingStyle(HtmlRenderingStyle):
 _html.HtmlRenderingStyle_swigregister(HtmlRenderingStylePtr)
 
 class DefaultHtmlRenderingStyle(HtmlRenderingStyle):

-    """"""

     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):
     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(wxColour clr) -> wxColour"""
+        """GetSelectedTextColour(Colour clr) -> Colour"""

         return _html.DefaultHtmlRenderingStyle_GetSelectedTextColour(*args, **kwargs)
 
     def GetSelectedTextBgColour(*args, **kwargs):
         return _html.DefaultHtmlRenderingStyle_GetSelectedTextColour(*args, **kwargs)
 
     def GetSelectedTextBgColour(*args, **kwargs):

-        """GetSelectedTextBgColour(wxColour clr) -> wxColour"""
+        """GetSelectedTextBgColour(Colour clr) -> Colour"""

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


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

-    """"""

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


@@ -608,7 +608,6 @@ HTML_FIND_EXACT = _html.HTML_FIND_EXACT
 HTML_FIND_NEAREST_BEFORE = _html.HTML_FIND_NEAREST_BEFORE
 HTML_FIND_NEAREST_AFTER = _html.HTML_FIND_NEAREST_AFTER
 class HtmlCell(core.Object):
 HTML_FIND_NEAREST_BEFORE = _html.HTML_FIND_NEAREST_BEFORE
 HTML_FIND_NEAREST_AFTER = _html.HTML_FIND_NEAREST_AFTER
 class HtmlCell(core.Object):

-    """"""

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


@@ -637,6 +636,14 @@ class HtmlCell(core.Object):
         """GetDescent() -> int"""
         return _html.HtmlCell_GetDescent(*args, **kwargs)
 
         """GetDescent() -> int"""
         return _html.HtmlCell_GetDescent(*args, **kwargs)
 

+    def GetId(*args, **kwargs):
+        """GetId() -> String"""
+        return _html.HtmlCell_GetId(*args, **kwargs)
+
+    def SetId(*args, **kwargs):
+        """SetId(String id)"""
+        return _html.HtmlCell_SetId(*args, **kwargs)
+

     def GetLink(*args, **kwargs):
         """GetLink(int x=0, int y=0) -> HtmlLinkInfo"""
         return _html.HtmlCell_GetLink(*args, **kwargs)
     def GetLink(*args, **kwargs):
         """GetLink(int x=0, int y=0) -> HtmlLinkInfo"""
         return _html.HtmlCell_GetLink(*args, **kwargs)


@@ -654,7 +661,7 @@ class HtmlCell(core.Object):
         return _html.HtmlCell_GetFirstChild(*args, **kwargs)
 
     def GetCursor(*args, **kwargs):
         return _html.HtmlCell_GetFirstChild(*args, **kwargs)
 
     def GetCursor(*args, **kwargs):

-        """GetCursor() -> wxCursor"""
+        """GetCursor() -> Cursor"""

         return _html.HtmlCell_GetCursor(*args, **kwargs)
 
     def IsFormattingCell(*args, **kwargs):
         return _html.HtmlCell_GetCursor(*args, **kwargs)
 
     def IsFormattingCell(*args, **kwargs):


@@ -682,11 +689,11 @@ class HtmlCell(core.Object):
         return _html.HtmlCell_Layout(*args, **kwargs)
 
     def Draw(*args, **kwargs):
         return _html.HtmlCell_Layout(*args, **kwargs)
 
     def Draw(*args, **kwargs):

-        """Draw(wxDC dc, int x, int y, int view_y1, int view_y2, HtmlRenderingInfo info)"""
+        """Draw(DC dc, int x, int y, int view_y1, int view_y2, HtmlRenderingInfo info)"""

         return _html.HtmlCell_Draw(*args, **kwargs)
 
     def DrawInvisible(*args, **kwargs):
         return _html.HtmlCell_Draw(*args, **kwargs)
 
     def DrawInvisible(*args, **kwargs):

-        """DrawInvisible(wxDC dc, int x, int y, HtmlRenderingInfo info)"""
+        """DrawInvisible(DC dc, int x, int y, HtmlRenderingInfo info)"""

         return _html.HtmlCell_DrawInvisible(*args, **kwargs)
 
     def Find(*args, **kwargs):
         return _html.HtmlCell_DrawInvisible(*args, **kwargs)
 
     def Find(*args, **kwargs):


@@ -734,7 +741,7 @@ class HtmlCell(core.Object):
         return _html.HtmlCell_IsBefore(*args, **kwargs)
 
     def ConvertToText(*args, **kwargs):
         return _html.HtmlCell_IsBefore(*args, **kwargs)
 
     def ConvertToText(*args, **kwargs):

-        """ConvertToText(HtmlSelection sel) -> wxString"""
+        """ConvertToText(HtmlSelection sel) -> String"""

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


@@ -746,11 +753,10 @@ class HtmlCellPtr(HtmlCell):
 _html.HtmlCell_swigregister(HtmlCellPtr)
 
 class HtmlWordCell(HtmlCell):
 _html.HtmlCell_swigregister(HtmlCellPtr)
 
 class HtmlWordCell(HtmlCell):

-    """"""

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

-        """__init__(wxString word, wxDC dc) -> HtmlWordCell"""
+        """__init__(String word, DC dc) -> HtmlWordCell"""

         newobj = _html.new_HtmlWordCell(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _html.new_HtmlWordCell(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


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

-    """"""

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


@@ -822,15 +827,15 @@ class HtmlContainerCell(HtmlCell):
         return _html.HtmlContainerCell_SetMinHeight(*args, **kwargs)
 
     def SetBackgroundColour(*args, **kwargs):
         return _html.HtmlContainerCell_SetMinHeight(*args, **kwargs)
 
     def SetBackgroundColour(*args, **kwargs):

-        """SetBackgroundColour(wxColour clr)"""
+        """SetBackgroundColour(Colour clr)"""

         return _html.HtmlContainerCell_SetBackgroundColour(*args, **kwargs)
 
     def GetBackgroundColour(*args, **kwargs):
         return _html.HtmlContainerCell_SetBackgroundColour(*args, **kwargs)
 
     def GetBackgroundColour(*args, **kwargs):

-        """GetBackgroundColour() -> wxColour"""
+        """GetBackgroundColour() -> Colour"""

         return _html.HtmlContainerCell_GetBackgroundColour(*args, **kwargs)
 
     def SetBorder(*args, **kwargs):
         return _html.HtmlContainerCell_GetBackgroundColour(*args, **kwargs)
 
     def SetBorder(*args, **kwargs):

-        """SetBorder(wxColour clr1, wxColour clr2)"""
+        """SetBorder(Colour clr1, Colour clr2)"""

         return _html.HtmlContainerCell_SetBorder(*args, **kwargs)
 
     def GetFirstChild(*args, **kwargs):
         return _html.HtmlContainerCell_SetBorder(*args, **kwargs)
 
     def GetFirstChild(*args, **kwargs):


@@ -846,11 +851,10 @@ class HtmlContainerCellPtr(HtmlContainerCell):
 _html.HtmlContainerCell_swigregister(HtmlContainerCellPtr)
 
 class HtmlColourCell(HtmlCell):
 _html.HtmlContainerCell_swigregister(HtmlContainerCellPtr)
 
 class HtmlColourCell(HtmlCell):

-    """"""

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

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

         newobj = _html.new_HtmlColourCell(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _html.new_HtmlColourCell(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -864,11 +868,10 @@ class HtmlColourCellPtr(HtmlColourCell):
 _html.HtmlColourCell_swigregister(HtmlColourCellPtr)
 
 class HtmlFontCell(HtmlCell):
 _html.HtmlColourCell_swigregister(HtmlColourCellPtr)
 
 class HtmlFontCell(HtmlCell):

-    """"""

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

-        """__init__(wxFont font) -> HtmlFontCell"""
+        """__init__(Font font) -> HtmlFontCell"""

         newobj = _html.new_HtmlFontCell(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _html.new_HtmlFontCell(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


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

-    """"""

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


@@ -902,7 +904,6 @@ _html.HtmlWidgetCell_swigregister(HtmlWidgetCellPtr)
 #---------------------------------------------------------------------------
 
 class HtmlFilter(core.Object):
 #---------------------------------------------------------------------------
 
 class HtmlFilter(core.Object):

-    """"""

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


@@ -928,13 +929,14 @@ _html.HtmlFilter_swigregister(HtmlFilterPtr)
 #---------------------------------------------------------------------------
 
 class HtmlWindow(windows.ScrolledWindow):
 #---------------------------------------------------------------------------
 
 class HtmlWindow(windows.ScrolledWindow):

-    """"""

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

-        """__init__(Window parent, int id=-1, Point pos=DefaultPosition, 
-    Size size=DefaultSize, int style=HW_DEFAULT_STYLE, 
-    wxString name=wxPyHtmlWindowNameStr) -> HtmlWindow"""
+        """
+        __init__(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
         newobj = _html.new_HtmlWindow(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -942,9 +944,11 @@ class HtmlWindow(windows.ScrolledWindow):
         self._setCallbackInfo(self, HtmlWindow); self._setOORInfo(self)
 
     def Create(*args, **kwargs):
         self._setCallbackInfo(self, HtmlWindow); self._setOORInfo(self)
 
     def Create(*args, **kwargs):

-        """Create(Window parent, int id=-1, Point pos=DefaultPosition, 
-    Size size=DefaultSize, int style=HW_SCROLLBAR_AUTO, 
-    wxString name=wxPyHtmlWindowNameStr) -> bool"""
+        """
+        Create(Window parent, int id=-1, Point pos=DefaultPosition, 
+            Size size=DefaultSize, int style=HW_SCROLLBAR_AUTO, 
+            String name=HtmlWindowNameStr) -> bool
+        """

         return _html.HtmlWindow_Create(*args, **kwargs)
 
     def _setCallbackInfo(*args, **kwargs):
         return _html.HtmlWindow_Create(*args, **kwargs)
 
     def _setCallbackInfo(*args, **kwargs):


@@ -952,35 +956,35 @@ class HtmlWindow(windows.ScrolledWindow):
         return _html.HtmlWindow__setCallbackInfo(*args, **kwargs)
 
     def SetPage(*args, **kwargs):
         return _html.HtmlWindow__setCallbackInfo(*args, **kwargs)
 
     def SetPage(*args, **kwargs):

-        """SetPage(wxString source) -> bool"""
+        """SetPage(String source) -> bool"""

         return _html.HtmlWindow_SetPage(*args, **kwargs)
 
     def LoadPage(*args, **kwargs):
         return _html.HtmlWindow_SetPage(*args, **kwargs)
 
     def LoadPage(*args, **kwargs):

-        """LoadPage(wxString location) -> bool"""
+        """LoadPage(String location) -> bool"""

         return _html.HtmlWindow_LoadPage(*args, **kwargs)
 
     def LoadFile(*args, **kwargs):
         return _html.HtmlWindow_LoadPage(*args, **kwargs)
 
     def LoadFile(*args, **kwargs):

-        """LoadFile(wxString filename) -> bool"""
+        """LoadFile(String filename) -> bool"""

         return _html.HtmlWindow_LoadFile(*args, **kwargs)
 
     def AppendToPage(*args, **kwargs):
         return _html.HtmlWindow_LoadFile(*args, **kwargs)
 
     def AppendToPage(*args, **kwargs):

-        """AppendToPage(wxString source) -> bool"""
+        """AppendToPage(String source) -> bool"""

         return _html.HtmlWindow_AppendToPage(*args, **kwargs)
 
     def GetOpenedPage(*args, **kwargs):
         return _html.HtmlWindow_AppendToPage(*args, **kwargs)
 
     def GetOpenedPage(*args, **kwargs):

-        """GetOpenedPage() -> wxString"""
+        """GetOpenedPage() -> String"""

         return _html.HtmlWindow_GetOpenedPage(*args, **kwargs)
 
     def GetOpenedAnchor(*args, **kwargs):
         return _html.HtmlWindow_GetOpenedPage(*args, **kwargs)
 
     def GetOpenedAnchor(*args, **kwargs):

-        """GetOpenedAnchor() -> wxString"""
+        """GetOpenedAnchor() -> String"""

         return _html.HtmlWindow_GetOpenedAnchor(*args, **kwargs)
 
     def GetOpenedPageTitle(*args, **kwargs):
         return _html.HtmlWindow_GetOpenedAnchor(*args, **kwargs)
 
     def GetOpenedPageTitle(*args, **kwargs):

-        """GetOpenedPageTitle() -> wxString"""
+        """GetOpenedPageTitle() -> String"""

         return _html.HtmlWindow_GetOpenedPageTitle(*args, **kwargs)
 
     def SetRelatedFrame(*args, **kwargs):
         return _html.HtmlWindow_GetOpenedPageTitle(*args, **kwargs)
 
     def SetRelatedFrame(*args, **kwargs):

-        """SetRelatedFrame(Frame frame, wxString format)"""
+        """SetRelatedFrame(Frame frame, String format)"""

         return _html.HtmlWindow_SetRelatedFrame(*args, **kwargs)
 
     def GetRelatedFrame(*args, **kwargs):
         return _html.HtmlWindow_SetRelatedFrame(*args, **kwargs)
 
     def GetRelatedFrame(*args, **kwargs):


@@ -992,11 +996,11 @@ class HtmlWindow(windows.ScrolledWindow):
         return _html.HtmlWindow_SetRelatedStatusBar(*args, **kwargs)
 
     def SetFonts(*args, **kwargs):
         return _html.HtmlWindow_SetRelatedStatusBar(*args, **kwargs)
 
     def SetFonts(*args, **kwargs):

-        """SetFonts(wxString normal_face, wxString fixed_face, PyObject sizes=None)"""
+        """SetFonts(String normal_face, String fixed_face, PyObject sizes=None)"""

         return _html.HtmlWindow_SetFonts(*args, **kwargs)
 
     def SetTitle(*args, **kwargs):
         return _html.HtmlWindow_SetFonts(*args, **kwargs)
 
     def SetTitle(*args, **kwargs):

-        """SetTitle(wxString title)"""
+        """SetTitle(String title)"""

         return _html.HtmlWindow_SetTitle(*args, **kwargs)
 
     def SetBorders(*args, **kwargs):
         return _html.HtmlWindow_SetTitle(*args, **kwargs)
 
     def SetBorders(*args, **kwargs):


@@ -1004,11 +1008,11 @@ class HtmlWindow(windows.ScrolledWindow):
         return _html.HtmlWindow_SetBorders(*args, **kwargs)
 
     def ReadCustomization(*args, **kwargs):
         return _html.HtmlWindow_SetBorders(*args, **kwargs)
 
     def ReadCustomization(*args, **kwargs):

-        """ReadCustomization(wxConfigBase cfg, wxString path=wxPyEmptyString)"""
+        """ReadCustomization(ConfigBase cfg, String path=EmptyString)"""

         return _html.HtmlWindow_ReadCustomization(*args, **kwargs)
 
     def WriteCustomization(*args, **kwargs):
         return _html.HtmlWindow_ReadCustomization(*args, **kwargs)
 
     def WriteCustomization(*args, **kwargs):

-        """WriteCustomization(wxConfigBase cfg, wxString path=wxPyEmptyString)"""
+        """WriteCustomization(ConfigBase cfg, String path=EmptyString)"""

         return _html.HtmlWindow_WriteCustomization(*args, **kwargs)
 
     def HistoryBack(*args, **kwargs):
         return _html.HtmlWindow_WriteCustomization(*args, **kwargs)
 
     def HistoryBack(*args, **kwargs):


@@ -1040,11 +1044,11 @@ class HtmlWindow(windows.ScrolledWindow):
         return _html.HtmlWindow_GetParser(*args, **kwargs)
 
     def ScrollToAnchor(*args, **kwargs):
         return _html.HtmlWindow_GetParser(*args, **kwargs)
 
     def ScrollToAnchor(*args, **kwargs):

-        """ScrollToAnchor(wxString anchor) -> bool"""
+        """ScrollToAnchor(String anchor) -> bool"""

         return _html.HtmlWindow_ScrollToAnchor(*args, **kwargs)
 
     def HasAnchor(*args, **kwargs):
         return _html.HtmlWindow_ScrollToAnchor(*args, **kwargs)
 
     def HasAnchor(*args, **kwargs):

-        """HasAnchor(wxString anchor) -> bool"""
+        """HasAnchor(String anchor) -> bool"""

         return _html.HtmlWindow_HasAnchor(*args, **kwargs)
 
     def AddFilter(*args, **kwargs):
         return _html.HtmlWindow_HasAnchor(*args, **kwargs)
 
     def AddFilter(*args, **kwargs):


@@ -1057,7 +1061,7 @@ class HtmlWindow(windows.ScrolledWindow):
         return _html.HtmlWindow_base_OnLinkClicked(*args, **kwargs)
 
     def base_OnSetTitle(*args, **kwargs):
         return _html.HtmlWindow_base_OnLinkClicked(*args, **kwargs)
 
     def base_OnSetTitle(*args, **kwargs):

-        """base_OnSetTitle(wxString title)"""
+        """base_OnSetTitle(String title)"""

         return _html.HtmlWindow_base_OnSetTitle(*args, **kwargs)
 
     def base_OnCellMouseHover(*args, **kwargs):
         return _html.HtmlWindow_base_OnSetTitle(*args, **kwargs)
 
     def base_OnCellMouseHover(*args, **kwargs):


@@ -1089,7 +1093,6 @@ def HtmlWindow_AddFilter(*args, **kwargs):
 #---------------------------------------------------------------------------
 
 class HtmlDCRenderer(core.Object):
 #---------------------------------------------------------------------------
 
 class HtmlDCRenderer(core.Object):

-    """"""

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


@@ -1105,7 +1108,7 @@ class HtmlDCRenderer(core.Object):
         except: pass
 
     def SetDC(*args, **kwargs):
         except: pass
 
     def SetDC(*args, **kwargs):

-        """SetDC(wxDC dc, int maxwidth)"""
+        """SetDC(DC dc, int maxwidth)"""

         return _html.HtmlDCRenderer_SetDC(*args, **kwargs)
 
     def SetSize(*args, **kwargs):
         return _html.HtmlDCRenderer_SetDC(*args, **kwargs)
 
     def SetSize(*args, **kwargs):


@@ -1113,16 +1116,18 @@ class HtmlDCRenderer(core.Object):
         return _html.HtmlDCRenderer_SetSize(*args, **kwargs)
 
     def SetHtmlText(*args, **kwargs):
         return _html.HtmlDCRenderer_SetSize(*args, **kwargs)
 
     def SetHtmlText(*args, **kwargs):

-        """SetHtmlText(wxString html, wxString basepath=wxPyEmptyString, bool isdir=True)"""
+        """SetHtmlText(String html, String basepath=EmptyString, bool isdir=True)"""

         return _html.HtmlDCRenderer_SetHtmlText(*args, **kwargs)
 
     def SetFonts(*args, **kwargs):
         return _html.HtmlDCRenderer_SetHtmlText(*args, **kwargs)
 
     def SetFonts(*args, **kwargs):

-        """SetFonts(wxString normal_face, wxString fixed_face, PyObject sizes=None)"""
+        """SetFonts(String normal_face, String fixed_face, PyObject sizes=None)"""

         return _html.HtmlDCRenderer_SetFonts(*args, **kwargs)
 
     def Render(*args, **kwargs):
         return _html.HtmlDCRenderer_SetFonts(*args, **kwargs)
 
     def Render(*args, **kwargs):

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

         return _html.HtmlDCRenderer_Render(*args, **kwargs)
 
     def GetTotalHeight(*args, **kwargs):
         return _html.HtmlDCRenderer_Render(*args, **kwargs)
 
     def GetTotalHeight(*args, **kwargs):


@@ -1141,38 +1146,39 @@ PAGE_ODD = _html.PAGE_ODD
 PAGE_EVEN = _html.PAGE_EVEN
 PAGE_ALL = _html.PAGE_ALL
 class HtmlPrintout(windows.Printout):
 PAGE_EVEN = _html.PAGE_EVEN
 PAGE_ALL = _html.PAGE_ALL
 class HtmlPrintout(windows.Printout):

-    """"""

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

-        """__init__(wxString title=wxPyHtmlPrintoutTitleStr) -> HtmlPrintout"""
+        """__init__(String title=HtmlPrintoutTitleStr) -> HtmlPrintout"""

         newobj = _html.new_HtmlPrintout(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def SetHtmlText(*args, **kwargs):
         newobj = _html.new_HtmlPrintout(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def SetHtmlText(*args, **kwargs):

-        """SetHtmlText(wxString html, wxString basepath=wxPyEmptyString, bool isdir=True)"""
+        """SetHtmlText(String html, String basepath=EmptyString, bool isdir=True)"""

         return _html.HtmlPrintout_SetHtmlText(*args, **kwargs)
 
     def SetHtmlFile(*args, **kwargs):
         return _html.HtmlPrintout_SetHtmlText(*args, **kwargs)
 
     def SetHtmlFile(*args, **kwargs):

-        """SetHtmlFile(wxString htmlfile)"""
+        """SetHtmlFile(String htmlfile)"""

         return _html.HtmlPrintout_SetHtmlFile(*args, **kwargs)
 
     def SetHeader(*args, **kwargs):
         return _html.HtmlPrintout_SetHtmlFile(*args, **kwargs)
 
     def SetHeader(*args, **kwargs):

-        """SetHeader(wxString header, int pg=PAGE_ALL)"""
+        """SetHeader(String header, int pg=PAGE_ALL)"""

         return _html.HtmlPrintout_SetHeader(*args, **kwargs)
 
     def SetFooter(*args, **kwargs):
         return _html.HtmlPrintout_SetHeader(*args, **kwargs)
 
     def SetFooter(*args, **kwargs):

-        """SetFooter(wxString footer, int pg=PAGE_ALL)"""
+        """SetFooter(String footer, int pg=PAGE_ALL)"""

         return _html.HtmlPrintout_SetFooter(*args, **kwargs)
 
     def SetFonts(*args, **kwargs):
         return _html.HtmlPrintout_SetFooter(*args, **kwargs)
 
     def SetFonts(*args, **kwargs):

-        """SetFonts(wxString normal_face, wxString fixed_face, PyObject sizes=None)"""
+        """SetFonts(String normal_face, String fixed_face, PyObject sizes=None)"""

         return _html.HtmlPrintout_SetFonts(*args, **kwargs)
 
     def SetMargins(*args, **kwargs):
         return _html.HtmlPrintout_SetFonts(*args, **kwargs)
 
     def SetMargins(*args, **kwargs):

-        """SetMargins(float top=25.2, float bottom=25.2, float left=25.2, 
-    float right=25.2, float spaces=5)"""
+        """
+        SetMargins(float top=25.2, float bottom=25.2, float left=25.2, 
+            float right=25.2, float spaces=5)
+        """

         return _html.HtmlPrintout_SetMargins(*args, **kwargs)
 
     def AddFilter(*args, **kwargs):
         return _html.HtmlPrintout_SetMargins(*args, **kwargs)
 
     def AddFilter(*args, **kwargs):


@@ -1202,11 +1208,10 @@ def HtmlPrintout_CleanUpStatics(*args, **kwargs):
     return _html.HtmlPrintout_CleanUpStatics(*args, **kwargs)
 
 class HtmlEasyPrinting(core.Object):
     return _html.HtmlPrintout_CleanUpStatics(*args, **kwargs)
 
 class HtmlEasyPrinting(core.Object):

-    """"""

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

-        """__init__(wxString name=wxPyHtmlPrintingTitleStr, Window parentWindow=None) -> HtmlEasyPrinting"""
+        """__init__(String name=HtmlPrintingTitleStr, Window parentWindow=None) -> HtmlEasyPrinting"""

         newobj = _html.new_HtmlEasyPrinting(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _html.new_HtmlEasyPrinting(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -1218,19 +1223,19 @@ class HtmlEasyPrinting(core.Object):
         except: pass
 
     def PreviewFile(*args, **kwargs):
         except: pass
 
     def PreviewFile(*args, **kwargs):

-        """PreviewFile(wxString htmlfile)"""
+        """PreviewFile(String htmlfile)"""

         return _html.HtmlEasyPrinting_PreviewFile(*args, **kwargs)
 
     def PreviewText(*args, **kwargs):
         return _html.HtmlEasyPrinting_PreviewFile(*args, **kwargs)
 
     def PreviewText(*args, **kwargs):

-        """PreviewText(wxString htmltext, wxString basepath=wxPyEmptyString)"""
+        """PreviewText(String htmltext, String basepath=EmptyString)"""

         return _html.HtmlEasyPrinting_PreviewText(*args, **kwargs)
 
     def PrintFile(*args, **kwargs):
         return _html.HtmlEasyPrinting_PreviewText(*args, **kwargs)
 
     def PrintFile(*args, **kwargs):

-        """PrintFile(wxString htmlfile)"""
+        """PrintFile(String htmlfile)"""

         return _html.HtmlEasyPrinting_PrintFile(*args, **kwargs)
 
     def PrintText(*args, **kwargs):
         return _html.HtmlEasyPrinting_PrintFile(*args, **kwargs)
 
     def PrintText(*args, **kwargs):

-        """PrintText(wxString htmltext, wxString basepath=wxPyEmptyString)"""
+        """PrintText(String htmltext, String basepath=EmptyString)"""

         return _html.HtmlEasyPrinting_PrintText(*args, **kwargs)
 
     def PrinterSetup(*args, **kwargs):
         return _html.HtmlEasyPrinting_PrintText(*args, **kwargs)
 
     def PrinterSetup(*args, **kwargs):


@@ -1242,15 +1247,15 @@ class HtmlEasyPrinting(core.Object):
         return _html.HtmlEasyPrinting_PageSetup(*args, **kwargs)
 
     def SetHeader(*args, **kwargs):
         return _html.HtmlEasyPrinting_PageSetup(*args, **kwargs)
 
     def SetHeader(*args, **kwargs):

-        """SetHeader(wxString header, int pg=PAGE_ALL)"""
+        """SetHeader(String header, int pg=PAGE_ALL)"""

         return _html.HtmlEasyPrinting_SetHeader(*args, **kwargs)
 
     def SetFooter(*args, **kwargs):
         return _html.HtmlEasyPrinting_SetHeader(*args, **kwargs)
 
     def SetFooter(*args, **kwargs):

-        """SetFooter(wxString footer, int pg=PAGE_ALL)"""
+        """SetFooter(String footer, int pg=PAGE_ALL)"""

         return _html.HtmlEasyPrinting_SetFooter(*args, **kwargs)
 
     def SetFonts(*args, **kwargs):
         return _html.HtmlEasyPrinting_SetFooter(*args, **kwargs)
 
     def SetFonts(*args, **kwargs):

-        """SetFonts(wxString normal_face, wxString fixed_face, PyObject sizes=None)"""
+        """SetFonts(String normal_face, String fixed_face, PyObject sizes=None)"""

         return _html.HtmlEasyPrinting_SetFonts(*args, **kwargs)
 
     def GetPrintData(*args, **kwargs):
         return _html.HtmlEasyPrinting_SetFonts(*args, **kwargs)
 
     def GetPrintData(*args, **kwargs):


@@ -1272,30 +1277,28 @@ _html.HtmlEasyPrinting_swigregister(HtmlEasyPrintingPtr)
 #---------------------------------------------------------------------------
 
 class HtmlBookRecord(object):
 #---------------------------------------------------------------------------
 
 class HtmlBookRecord(object):

-    """"""

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

-        """__init__(wxString bookfile, wxString basepath, wxString title, 
-    wxString start) -> HtmlBookRecord"""
+        """__init__(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
     def GetBookFile(*args, **kwargs):
         newobj = _html.new_HtmlBookRecord(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
     def GetBookFile(*args, **kwargs):

-        """GetBookFile() -> wxString"""
+        """GetBookFile() -> String"""

         return _html.HtmlBookRecord_GetBookFile(*args, **kwargs)
 
     def GetTitle(*args, **kwargs):
         return _html.HtmlBookRecord_GetBookFile(*args, **kwargs)
 
     def GetTitle(*args, **kwargs):

-        """GetTitle() -> wxString"""
+        """GetTitle() -> String"""

         return _html.HtmlBookRecord_GetTitle(*args, **kwargs)
 
     def GetStart(*args, **kwargs):
         return _html.HtmlBookRecord_GetTitle(*args, **kwargs)
 
     def GetStart(*args, **kwargs):

-        """GetStart() -> wxString"""
+        """GetStart() -> String"""

         return _html.HtmlBookRecord_GetStart(*args, **kwargs)
 
     def GetBasePath(*args, **kwargs):
         return _html.HtmlBookRecord_GetStart(*args, **kwargs)
 
     def GetBasePath(*args, **kwargs):

-        """GetBasePath() -> wxString"""
+        """GetBasePath() -> String"""

         return _html.HtmlBookRecord_GetBasePath(*args, **kwargs)
 
     def SetContentsRange(*args, **kwargs):
         return _html.HtmlBookRecord_GetBasePath(*args, **kwargs)
 
     def SetContentsRange(*args, **kwargs):


@@ -1311,19 +1314,19 @@ class HtmlBookRecord(object):
         return _html.HtmlBookRecord_GetContentsEnd(*args, **kwargs)
 
     def SetTitle(*args, **kwargs):
         return _html.HtmlBookRecord_GetContentsEnd(*args, **kwargs)
 
     def SetTitle(*args, **kwargs):

-        """SetTitle(wxString title)"""
+        """SetTitle(String title)"""

         return _html.HtmlBookRecord_SetTitle(*args, **kwargs)
 
     def SetBasePath(*args, **kwargs):
         return _html.HtmlBookRecord_SetTitle(*args, **kwargs)
 
     def SetBasePath(*args, **kwargs):

-        """SetBasePath(wxString path)"""
+        """SetBasePath(String path)"""

         return _html.HtmlBookRecord_SetBasePath(*args, **kwargs)
 
     def SetStart(*args, **kwargs):
         return _html.HtmlBookRecord_SetBasePath(*args, **kwargs)
 
     def SetStart(*args, **kwargs):

-        """SetStart(wxString start)"""
+        """SetStart(String start)"""

         return _html.HtmlBookRecord_SetStart(*args, **kwargs)
 
     def GetFullPath(*args, **kwargs):
         return _html.HtmlBookRecord_SetStart(*args, **kwargs)
 
     def GetFullPath(*args, **kwargs):

-        """GetFullPath(wxString page) -> wxString"""
+        """GetFullPath(String page) -> String"""

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


@@ -1335,7 +1338,6 @@ class HtmlBookRecordPtr(HtmlBookRecord):
 _html.HtmlBookRecord_swigregister(HtmlBookRecordPtr)
 
 class HtmlContentsItem(object):
 _html.HtmlBookRecord_swigregister(HtmlBookRecordPtr)
 
 class HtmlContentsItem(object):

-    """"""

     def __init__(self): raise RuntimeError, "No constructor defined"
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlContentsItem instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __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,)


@@ -1348,11 +1350,11 @@ class HtmlContentsItem(object):
         return _html.HtmlContentsItem_GetID(*args, **kwargs)
 
     def GetName(*args, **kwargs):
         return _html.HtmlContentsItem_GetID(*args, **kwargs)
 
     def GetName(*args, **kwargs):

-        """GetName() -> wxString"""
+        """GetName() -> String"""

         return _html.HtmlContentsItem_GetName(*args, **kwargs)
 
     def GetPage(*args, **kwargs):
         return _html.HtmlContentsItem_GetName(*args, **kwargs)
 
     def GetPage(*args, **kwargs):

-        """GetPage() -> wxString"""
+        """GetPage() -> String"""

         return _html.HtmlContentsItem_GetPage(*args, **kwargs)
 
     def GetBook(*args, **kwargs):
         return _html.HtmlContentsItem_GetPage(*args, **kwargs)
 
     def GetBook(*args, **kwargs):


@@ -1368,7 +1370,6 @@ class HtmlContentsItemPtr(HtmlContentsItem):
 _html.HtmlContentsItem_swigregister(HtmlContentsItemPtr)
 
 class HtmlSearchStatus(object):
 _html.HtmlContentsItem_swigregister(HtmlContentsItemPtr)
 
 class HtmlSearchStatus(object):

-    """"""

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


@@ -1389,7 +1390,7 @@ class HtmlSearchStatus(object):
         return _html.HtmlSearchStatus_GetMaxIndex(*args, **kwargs)
 
     def GetName(*args, **kwargs):
         return _html.HtmlSearchStatus_GetMaxIndex(*args, **kwargs)
 
     def GetName(*args, **kwargs):

-        """GetName() -> wxString"""
+        """GetName() -> String"""

         return _html.HtmlSearchStatus_GetName(*args, **kwargs)
 
     def GetContentsItem(*args, **kwargs):
         return _html.HtmlSearchStatus_GetName(*args, **kwargs)
 
     def GetContentsItem(*args, **kwargs):


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

-    """"""

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


@@ -1421,19 +1421,19 @@ class HtmlHelpData(object):
         except: pass
 
     def SetTempDir(*args, **kwargs):
         except: pass
 
     def SetTempDir(*args, **kwargs):

-        """SetTempDir(wxString path)"""
+        """SetTempDir(String path)"""

         return _html.HtmlHelpData_SetTempDir(*args, **kwargs)
 
     def AddBook(*args, **kwargs):
         return _html.HtmlHelpData_SetTempDir(*args, **kwargs)
 
     def AddBook(*args, **kwargs):

-        """AddBook(wxString book) -> bool"""
+        """AddBook(String book) -> bool"""

         return _html.HtmlHelpData_AddBook(*args, **kwargs)
 
     def FindPageByName(*args, **kwargs):
         return _html.HtmlHelpData_AddBook(*args, **kwargs)
 
     def FindPageByName(*args, **kwargs):

-        """FindPageByName(wxString page) -> wxString"""
+        """FindPageByName(String page) -> String"""

         return _html.HtmlHelpData_FindPageByName(*args, **kwargs)
 
     def FindPageById(*args, **kwargs):
         return _html.HtmlHelpData_FindPageByName(*args, **kwargs)
 
     def FindPageById(*args, **kwargs):

-        """FindPageById(int id) -> wxString"""
+        """FindPageById(int id) -> String"""

         return _html.HtmlHelpData_FindPageById(*args, **kwargs)
 
     def GetBookRecArray(*args, **kwargs):
         return _html.HtmlHelpData_FindPageById(*args, **kwargs)
 
     def GetBookRecArray(*args, **kwargs):


@@ -1465,12 +1465,13 @@ class HtmlHelpDataPtr(HtmlHelpData):
 _html.HtmlHelpData_swigregister(HtmlHelpDataPtr)
 
 class HtmlHelpFrame(windows.Frame):
 _html.HtmlHelpData_swigregister(HtmlHelpDataPtr)
 
 class HtmlHelpFrame(windows.Frame):

-    """"""

     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):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxHtmlHelpFrame instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):

-        """__init__(Window parent, int ??, wxString title=wxPyEmptyString, 
-    int style=HF_DEFAULTSTYLE, HtmlHelpData data=None) -> HtmlHelpFrame"""
+        """
+        __init__(Window parent, int ??, String title=EmptyString, int style=HF_DEFAULTSTYLE, 
+            HtmlHelpData data=None) -> HtmlHelpFrame
+        """

         newobj = _html.new_HtmlHelpFrame(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
         newobj = _html.new_HtmlHelpFrame(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1


@@ -1482,11 +1483,11 @@ class HtmlHelpFrame(windows.Frame):
         return _html.HtmlHelpFrame_GetData(*args, **kwargs)
 
     def SetTitleFormat(*args, **kwargs):
         return _html.HtmlHelpFrame_GetData(*args, **kwargs)
 
     def SetTitleFormat(*args, **kwargs):

-        """SetTitleFormat(wxString format)"""
+        """SetTitleFormat(String format)"""

         return _html.HtmlHelpFrame_SetTitleFormat(*args, **kwargs)
 
     def Display(*args, **kwargs):
         return _html.HtmlHelpFrame_SetTitleFormat(*args, **kwargs)
 
     def Display(*args, **kwargs):

-        """Display(wxString x)"""
+        """Display(String x)"""

         return _html.HtmlHelpFrame_Display(*args, **kwargs)
 
     def DisplayID(*args, **kwargs):
         return _html.HtmlHelpFrame_Display(*args, **kwargs)
 
     def DisplayID(*args, **kwargs):


@@ -1502,19 +1503,19 @@ class HtmlHelpFrame(windows.Frame):
         return _html.HtmlHelpFrame_DisplayIndex(*args, **kwargs)
 
     def KeywordSearch(*args, **kwargs):
         return _html.HtmlHelpFrame_DisplayIndex(*args, **kwargs)
 
     def KeywordSearch(*args, **kwargs):

-        """KeywordSearch(wxString keyword) -> bool"""
+        """KeywordSearch(String keyword) -> bool"""

         return _html.HtmlHelpFrame_KeywordSearch(*args, **kwargs)
 
     def UseConfig(*args, **kwargs):
         return _html.HtmlHelpFrame_KeywordSearch(*args, **kwargs)
 
     def UseConfig(*args, **kwargs):

-        """UseConfig(wxConfigBase config, wxString rootpath=wxPyEmptyString)"""
+        """UseConfig(ConfigBase config, String rootpath=EmptyString)"""

         return _html.HtmlHelpFrame_UseConfig(*args, **kwargs)
 
     def ReadCustomization(*args, **kwargs):
         return _html.HtmlHelpFrame_UseConfig(*args, **kwargs)
 
     def ReadCustomization(*args, **kwargs):

-        """ReadCustomization(wxConfigBase cfg, wxString path=wxPyEmptyString)"""
+        """ReadCustomization(ConfigBase cfg, String path=EmptyString)"""

         return _html.HtmlHelpFrame_ReadCustomization(*args, **kwargs)
 
     def WriteCustomization(*args, **kwargs):
         return _html.HtmlHelpFrame_ReadCustomization(*args, **kwargs)
 
     def WriteCustomization(*args, **kwargs):

-        """WriteCustomization(wxConfigBase cfg, wxString path=wxPyEmptyString)"""
+        """WriteCustomization(ConfigBase cfg, String path=EmptyString)"""

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


@@ -1535,7 +1536,6 @@ HF_OPENFILES = _html.HF_OPENFILES
 HF_PRINT = _html.HF_PRINT
 HF_DEFAULTSTYLE = _html.HF_DEFAULTSTYLE
 class HtmlHelpController(core.EvtHandler):
 HF_PRINT = _html.HF_PRINT
 HF_DEFAULTSTYLE = _html.HF_DEFAULTSTYLE
 class HtmlHelpController(core.EvtHandler):

-    """"""

     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):
     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):


@@ -1553,19 +1553,19 @@ class HtmlHelpController(core.EvtHandler):
         except: pass
 
     def SetTitleFormat(*args, **kwargs):
         except: pass
 
     def SetTitleFormat(*args, **kwargs):

-        """SetTitleFormat(wxString format)"""
+        """SetTitleFormat(String format)"""

         return _html.HtmlHelpController_SetTitleFormat(*args, **kwargs)
 
     def SetTempDir(*args, **kwargs):
         return _html.HtmlHelpController_SetTitleFormat(*args, **kwargs)
 
     def SetTempDir(*args, **kwargs):

-        """SetTempDir(wxString path)"""
+        """SetTempDir(String path)"""

         return _html.HtmlHelpController_SetTempDir(*args, **kwargs)
 
     def AddBook(*args, **kwargs):
         return _html.HtmlHelpController_SetTempDir(*args, **kwargs)
 
     def AddBook(*args, **kwargs):

-        """AddBook(wxString book, int show_wait_msg=False) -> bool"""
+        """AddBook(String book, int show_wait_msg=False) -> bool"""

         return _html.HtmlHelpController_AddBook(*args, **kwargs)
 
     def Display(*args, **kwargs):
         return _html.HtmlHelpController_AddBook(*args, **kwargs)
 
     def Display(*args, **kwargs):

-        """Display(wxString x)"""
+        """Display(String x)"""

         return _html.HtmlHelpController_Display(*args, **kwargs)
 
     def DisplayID(*args, **kwargs):
         return _html.HtmlHelpController_Display(*args, **kwargs)
 
     def DisplayID(*args, **kwargs):


@@ -1581,19 +1581,19 @@ class HtmlHelpController(core.EvtHandler):
         return _html.HtmlHelpController_DisplayIndex(*args, **kwargs)
 
     def KeywordSearch(*args, **kwargs):
         return _html.HtmlHelpController_DisplayIndex(*args, **kwargs)
 
     def KeywordSearch(*args, **kwargs):

-        """KeywordSearch(wxString keyword) -> bool"""
+        """KeywordSearch(String keyword) -> bool"""

         return _html.HtmlHelpController_KeywordSearch(*args, **kwargs)
 
     def UseConfig(*args, **kwargs):
         return _html.HtmlHelpController_KeywordSearch(*args, **kwargs)
 
     def UseConfig(*args, **kwargs):

-        """UseConfig(wxConfigBase config, wxString rootpath=wxPyEmptyString)"""
+        """UseConfig(ConfigBase config, String rootpath=EmptyString)"""

         return _html.HtmlHelpController_UseConfig(*args, **kwargs)
 
     def ReadCustomization(*args, **kwargs):
         return _html.HtmlHelpController_UseConfig(*args, **kwargs)
 
     def ReadCustomization(*args, **kwargs):

-        """ReadCustomization(wxConfigBase cfg, wxString path=wxPyEmptyString)"""
+        """ReadCustomization(ConfigBase cfg, String path=EmptyString)"""

         return _html.HtmlHelpController_ReadCustomization(*args, **kwargs)
 
     def WriteCustomization(*args, **kwargs):
         return _html.HtmlHelpController_ReadCustomization(*args, **kwargs)
 
     def WriteCustomization(*args, **kwargs):

-        """WriteCustomization(wxConfigBase cfg, wxString path=wxPyEmptyString)"""
+        """WriteCustomization(ConfigBase cfg, String path=EmptyString)"""

         return _html.HtmlHelpController_WriteCustomization(*args, **kwargs)
 
     def GetFrame(*args, **kwargs):
         return _html.HtmlHelpController_WriteCustomization(*args, **kwargs)
 
     def GetFrame(*args, **kwargs):