Added comment makeg95.env

[wxWidgets.git] / utils / wxPython / modules / html / html.py

diff --git a/utils/wxPython/modules/html/html.py b/utils/wxPython/modules/html/html.py
index a9a37900cb6124e7d7d266d184227bc5676b444f..4231aac0cd51acdfa45a63344765fcd769624321 100644 (file)
--- a/utils/wxPython/modules/html/html.py
+++ b/utils/wxPython/modules/html/html.py
@@ -9,6 +9,8 @@ from windows import *
 
 from gdi import *
 
 
 from gdi import *
 

+from clip_dnd import *
+

 from events import *
 
 from mdi import *
 from events import *
 
 from mdi import *


@@ -30,8 +32,37 @@ from windows3 import *
 from image import *
 
 from printfw import *
 from image import *
 
 from printfw import *

-import wx,htmlhelper
-widget = htmlc
+
+from sizers import *
+import wx
+class wxHtmlLinkInfoPtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def GetHref(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlLinkInfo_GetHref,(self,) + _args, _kwargs)
+        return val
+    def GetTarget(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlLinkInfo_GetTarget,(self,) + _args, _kwargs)
+        return val
+    def GetEvent(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlLinkInfo_GetEvent,(self,) + _args, _kwargs)
+        if val: val = wxMouseEventPtr(val) 
+        return val
+    def GetHtmlCell(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlLinkInfo_GetHtmlCell,(self,) + _args, _kwargs)
+        if val: val = wxHtmlCellPtr(val) 
+        return val
+    def __repr__(self):
+        return "<C wxHtmlLinkInfo instance at %s>" % (self.this,)
+class wxHtmlLinkInfo(wxHtmlLinkInfoPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(htmlc.new_wxHtmlLinkInfo,_args,_kwargs)
+        self.thisown = 1
+
+
+
+

 class wxHtmlTagPtr :
     def __init__(self,this):
         self.this = this
 class wxHtmlTagPtr :
     def __init__(self,this):
         self.this = this


@@ -100,6 +131,12 @@ class wxHtmlParserPtr :
     def GetSource(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlParser_GetSource,(self,) + _args, _kwargs)
         return val
     def GetSource(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlParser_GetSource,(self,) + _args, _kwargs)
         return val

+    def PushTagHandler(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlParser_PushTagHandler,(self,) + _args, _kwargs)
+        return val
+    def PopTagHandler(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlParser_PopTagHandler,(self,) + _args, _kwargs)
+        return val

     def __repr__(self):
         return "<C wxHtmlParser instance at %s>" % (self.this,)
 class wxHtmlParser(wxHtmlParserPtr):
     def __repr__(self):
         return "<C wxHtmlParser instance at %s>" % (self.this,)
 class wxHtmlParser(wxHtmlParserPtr):


@@ -141,6 +178,10 @@ class wxHtmlWinParserPtr(wxHtmlParserPtr):
         val = apply(htmlc.wxHtmlWinParser_OpenContainer,(self,) + _args, _kwargs)
         if val: val = wxHtmlContainerCellPtr(val) 
         return val
         val = apply(htmlc.wxHtmlWinParser_OpenContainer,(self,) + _args, _kwargs)
         if val: val = wxHtmlContainerCellPtr(val) 
         return val

+    def SetContainer(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinParser_SetContainer,(self,) + _args, _kwargs)
+        if val: val = wxHtmlContainerCellPtr(val) 
+        return val

     def CloseContainer(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlWinParser_CloseContainer,(self,) + _args, _kwargs)
         if val: val = wxHtmlContainerCellPtr(val) 
     def CloseContainer(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlWinParser_CloseContainer,(self,) + _args, _kwargs)
         if val: val = wxHtmlContainerCellPtr(val) 


@@ -195,9 +236,6 @@ class wxHtmlWinParserPtr(wxHtmlParserPtr):
     def SetActualColor(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlWinParser_SetActualColor,(self,) + _args, _kwargs)
         return val
     def SetActualColor(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlWinParser_SetActualColor,(self,) + _args, _kwargs)
         return val

-    def GetLink(self, *_args, **_kwargs):
-        val = apply(htmlc.wxHtmlWinParser_GetLink,(self,) + _args, _kwargs)
-        return val

     def SetLink(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlWinParser_SetLink,(self,) + _args, _kwargs)
         return val
     def SetLink(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlWinParser_SetLink,(self,) + _args, _kwargs)
         return val


@@ -205,6 +243,10 @@ class wxHtmlWinParserPtr(wxHtmlParserPtr):
         val = apply(htmlc.wxHtmlWinParser_CreateCurrentFont,(self,) + _args, _kwargs)
         if val: val = wxFontPtr(val) 
         return val
         val = apply(htmlc.wxHtmlWinParser_CreateCurrentFont,(self,) + _args, _kwargs)
         if val: val = wxFontPtr(val) 
         return val

+    def GetLink(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinParser_GetLink,(self,) + _args, _kwargs)
+        if val: val = wxHtmlLinkInfoPtr(val) ; val.thisown = 1
+        return val

     def __repr__(self):
         return "<C wxHtmlWinParser instance at %s>" % (self.this,)
 class wxHtmlWinParser(wxHtmlWinParserPtr):
     def __repr__(self):
         return "<C wxHtmlWinParser instance at %s>" % (self.this,)
 class wxHtmlWinParser(wxHtmlWinParserPtr):


@@ -275,13 +317,6 @@ class wxHtmlCellPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def SetParent(self, *_args, **_kwargs):
-        val = apply(htmlc.wxHtmlCell_SetParent,(self,) + _args, _kwargs)
-        return val
-    def GetParent(self, *_args, **_kwargs):
-        val = apply(htmlc.wxHtmlCell_GetParent,(self,) + _args, _kwargs)
-        if val: val = wxHtmlContainerCellPtr(val) 
-        return val

     def GetPosX(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlCell_GetPosX,(self,) + _args, _kwargs)
         return val
     def GetPosX(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlCell_GetPosX,(self,) + _args, _kwargs)
         return val


@@ -299,13 +334,15 @@ class wxHtmlCellPtr :
         return val
     def GetLink(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlCell_GetLink,(self,) + _args, _kwargs)
         return val
     def GetLink(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlCell_GetLink,(self,) + _args, _kwargs)

+        if val: val = wxHtmlLinkInfoPtr(val) 

         return val
     def GetNext(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlCell_GetNext,(self,) + _args, _kwargs)
         if val: val = wxHtmlCellPtr(val) 
         return val
         return val
     def GetNext(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlCell_GetNext,(self,) + _args, _kwargs)
         if val: val = wxHtmlCellPtr(val) 
         return val

-    def SetPos(self, *_args, **_kwargs):
-        val = apply(htmlc.wxHtmlCell_SetPos,(self,) + _args, _kwargs)
+    def GetParent(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlCell_GetParent,(self,) + _args, _kwargs)
+        if val: val = wxHtmlContainerCellPtr(val) 

         return val
     def SetLink(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlCell_SetLink,(self,) + _args, _kwargs)
         return val
     def SetLink(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlCell_SetLink,(self,) + _args, _kwargs)


@@ -313,6 +350,12 @@ class wxHtmlCellPtr :
     def SetNext(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlCell_SetNext,(self,) + _args, _kwargs)
         return val
     def SetNext(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlCell_SetNext,(self,) + _args, _kwargs)
         return val

+    def SetParent(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlCell_SetParent,(self,) + _args, _kwargs)
+        return val
+    def SetPos(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlCell_SetPos,(self,) + _args, _kwargs)
+        return val

     def Layout(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlCell_Layout,(self,) + _args, _kwargs)
         return val
     def Layout(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlCell_Layout,(self,) + _args, _kwargs)
         return val


@@ -326,6 +369,12 @@ class wxHtmlCellPtr :
         val = apply(htmlc.wxHtmlCell_Find,(self,) + _args, _kwargs)
         if val: val = wxHtmlCellPtr(val) 
         return val
         val = apply(htmlc.wxHtmlCell_Find,(self,) + _args, _kwargs)
         if val: val = wxHtmlCellPtr(val) 
         return val

+    def AdjustPagebreak(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlCell_AdjustPagebreak,(self,) + _args, _kwargs)
+        return val
+    def SetCanLiveOnPagebreak(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlCell_SetCanLiveOnPagebreak,(self,) + _args, _kwargs)
+        return val

     def __repr__(self):
         return "<C wxHtmlCell instance at %s>" % (self.this,)
 class wxHtmlCell(wxHtmlCellPtr):
     def __repr__(self):
         return "<C wxHtmlCell instance at %s>" % (self.this,)
 class wxHtmlCell(wxHtmlCellPtr):


@@ -376,9 +425,6 @@ class wxHtmlContainerCellPtr(wxHtmlCellPtr):
     def SetMinHeight(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlContainerCell_SetMinHeight,(self,) + _args, _kwargs)
         return val
     def SetMinHeight(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlContainerCell_SetMinHeight,(self,) + _args, _kwargs)
         return val

-    def GetMaxLineWidth(self, *_args, **_kwargs):
-        val = apply(htmlc.wxHtmlContainerCell_GetMaxLineWidth,(self,) + _args, _kwargs)
-        return val

     def SetBackgroundColour(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlContainerCell_SetBackgroundColour,(self,) + _args, _kwargs)
         return val
     def SetBackgroundColour(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlContainerCell_SetBackgroundColour,(self,) + _args, _kwargs)
         return val


@@ -399,6 +445,20 @@ class wxHtmlContainerCell(wxHtmlContainerCellPtr):
 
 
 
 
 
 

+class wxHtmlColourCellPtr(wxHtmlCellPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __repr__(self):
+        return "<C wxHtmlColourCell instance at %s>" % (self.this,)
+class wxHtmlColourCell(wxHtmlColourCellPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(htmlc.new_wxHtmlColourCell,_args,_kwargs)
+        self.thisown = 1
+
+
+
+

 class wxHtmlWidgetCellPtr(wxHtmlCellPtr):
     def __init__(self,this):
         self.this = this
 class wxHtmlWidgetCellPtr(wxHtmlCellPtr):
     def __init__(self,this):
         self.this = this


@@ -500,6 +560,9 @@ class wxHtmlWindowPtr(wxScrolledWindowPtr):
     def base_OnLinkClicked(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlWindow_base_OnLinkClicked,(self,) + _args, _kwargs)
         return val
     def base_OnLinkClicked(self, *_args, **_kwargs):
         val = apply(htmlc.wxHtmlWindow_base_OnLinkClicked,(self,) + _args, _kwargs)
         return val

+    def base_OnSetTitle(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWindow_base_OnSetTitle,(self,) + _args, _kwargs)
+        return val

     def __repr__(self):
         return "<C wxHtmlWindow instance at %s>" % (self.this,)
 class wxHtmlWindow(wxHtmlWindowPtr):
     def __repr__(self):
         return "<C wxHtmlWindow instance at %s>" % (self.this,)
 class wxHtmlWindow(wxHtmlWindowPtr):


@@ -513,6 +576,119 @@ class wxHtmlWindow(wxHtmlWindowPtr):
 
 
 
 
 
 

+class wxHtmlDCRendererPtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __del__(self,htmlc=htmlc):
+        if self.thisown == 1 :
+            htmlc.delete_wxHtmlDCRenderer(self)
+    def SetDC(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlDCRenderer_SetDC,(self,) + _args, _kwargs)
+        return val
+    def SetSize(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlDCRenderer_SetSize,(self,) + _args, _kwargs)
+        return val
+    def SetHtmlText(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlDCRenderer_SetHtmlText,(self,) + _args, _kwargs)
+        return val
+    def Render(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlDCRenderer_Render,(self,) + _args, _kwargs)
+        return val
+    def GetTotalHeight(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlDCRenderer_GetTotalHeight,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxHtmlDCRenderer instance at %s>" % (self.this,)
+class wxHtmlDCRenderer(wxHtmlDCRendererPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(htmlc.new_wxHtmlDCRenderer,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
+class wxHtmlPrintoutPtr(wxPrintoutPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __del__(self,htmlc=htmlc):
+        if self.thisown == 1 :
+            htmlc.delete_wxHtmlPrintout(self)
+    def SetHtmlText(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlPrintout_SetHtmlText,(self,) + _args, _kwargs)
+        return val
+    def SetHtmlFile(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlPrintout_SetHtmlFile,(self,) + _args, _kwargs)
+        return val
+    def SetHeader(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlPrintout_SetHeader,(self,) + _args, _kwargs)
+        return val
+    def SetFooter(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlPrintout_SetFooter,(self,) + _args, _kwargs)
+        return val
+    def SetMargins(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlPrintout_SetMargins,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxHtmlPrintout instance at %s>" % (self.this,)
+class wxHtmlPrintout(wxHtmlPrintoutPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(htmlc.new_wxHtmlPrintout,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
+class wxHtmlEasyPrintingPtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __del__(self,htmlc=htmlc):
+        if self.thisown == 1 :
+            htmlc.delete_wxHtmlEasyPrinting(self)
+    def PreviewFile(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlEasyPrinting_PreviewFile,(self,) + _args, _kwargs)
+        return val
+    def PreviewText(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlEasyPrinting_PreviewText,(self,) + _args, _kwargs)
+        return val
+    def PrintFile(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlEasyPrinting_PrintFile,(self,) + _args, _kwargs)
+        return val
+    def PrintText(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlEasyPrinting_PrintText,(self,) + _args, _kwargs)
+        return val
+    def PrinterSetup(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlEasyPrinting_PrinterSetup,(self,) + _args, _kwargs)
+        return val
+    def PageSetup(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlEasyPrinting_PageSetup,(self,) + _args, _kwargs)
+        return val
+    def SetHeader(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlEasyPrinting_SetHeader,(self,) + _args, _kwargs)
+        return val
+    def SetFooter(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlEasyPrinting_SetFooter,(self,) + _args, _kwargs)
+        return val
+    def GetPrintData(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlEasyPrinting_GetPrintData,(self,) + _args, _kwargs)
+        if val: val = wxPrintDataPtr(val) 
+        return val
+    def GetPageSetupData(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlEasyPrinting_GetPageSetupData,(self,) + _args, _kwargs)
+        if val: val = wxPageSetupDialogDataPtr(val) 
+        return val
+    def __repr__(self):
+        return "<C wxHtmlEasyPrinting instance at %s>" % (self.this,)
+class wxHtmlEasyPrinting(wxHtmlEasyPrintingPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(htmlc.new_wxHtmlEasyPrinting,_args,_kwargs)
+        self.thisown = 1
+
+
+
+

 
 
 #-------------- FUNCTION WRAPPERS ------------------
 
 
 #-------------- FUNCTION WRAPPERS ------------------


@@ -525,25 +701,28 @@ wxHtmlWindow_AddFilter = htmlc.wxHtmlWindow_AddFilter
 
 #-------------- VARIABLE WRAPPERS ------------------
 
 
 #-------------- VARIABLE WRAPPERS ------------------
 

-HTML_ALIGN_LEFT = htmlc.HTML_ALIGN_LEFT
-HTML_ALIGN_CENTER = htmlc.HTML_ALIGN_CENTER
-HTML_ALIGN_RIGHT = htmlc.HTML_ALIGN_RIGHT
-HTML_ALIGN_BOTTOM = htmlc.HTML_ALIGN_BOTTOM
-HTML_ALIGN_TOP = htmlc.HTML_ALIGN_TOP
-HTML_CLR_FOREGROUND = htmlc.HTML_CLR_FOREGROUND
-HTML_CLR_BACKGROUND = htmlc.HTML_CLR_BACKGROUND
-HTML_UNITS_PIXELS = htmlc.HTML_UNITS_PIXELS
-HTML_UNITS_PERCENT = htmlc.HTML_UNITS_PERCENT
-HTML_INDENT_LEFT = htmlc.HTML_INDENT_LEFT
-HTML_INDENT_RIGHT = htmlc.HTML_INDENT_RIGHT
-HTML_INDENT_TOP = htmlc.HTML_INDENT_TOP
-HTML_INDENT_BOTTOM = htmlc.HTML_INDENT_BOTTOM
-HTML_INDENT_HORIZONTAL = htmlc.HTML_INDENT_HORIZONTAL
-HTML_INDENT_VERTICAL = htmlc.HTML_INDENT_VERTICAL
-HTML_INDENT_ALL = htmlc.HTML_INDENT_ALL
-HTML_COND_ISANCHOR = htmlc.HTML_COND_ISANCHOR
-HTML_COND_ISIMAGEMAP = htmlc.HTML_COND_ISIMAGEMAP
-HTML_COND_USER = htmlc.HTML_COND_USER
+wxHTML_ALIGN_LEFT = htmlc.wxHTML_ALIGN_LEFT
+wxHTML_ALIGN_CENTER = htmlc.wxHTML_ALIGN_CENTER
+wxHTML_ALIGN_RIGHT = htmlc.wxHTML_ALIGN_RIGHT
+wxHTML_ALIGN_BOTTOM = htmlc.wxHTML_ALIGN_BOTTOM
+wxHTML_ALIGN_TOP = htmlc.wxHTML_ALIGN_TOP
+wxHTML_CLR_FOREGROUND = htmlc.wxHTML_CLR_FOREGROUND
+wxHTML_CLR_BACKGROUND = htmlc.wxHTML_CLR_BACKGROUND
+wxHTML_UNITS_PIXELS = htmlc.wxHTML_UNITS_PIXELS
+wxHTML_UNITS_PERCENT = htmlc.wxHTML_UNITS_PERCENT
+wxHTML_INDENT_LEFT = htmlc.wxHTML_INDENT_LEFT
+wxHTML_INDENT_RIGHT = htmlc.wxHTML_INDENT_RIGHT
+wxHTML_INDENT_TOP = htmlc.wxHTML_INDENT_TOP
+wxHTML_INDENT_BOTTOM = htmlc.wxHTML_INDENT_BOTTOM
+wxHTML_INDENT_HORIZONTAL = htmlc.wxHTML_INDENT_HORIZONTAL
+wxHTML_INDENT_VERTICAL = htmlc.wxHTML_INDENT_VERTICAL
+wxHTML_INDENT_ALL = htmlc.wxHTML_INDENT_ALL
+wxHTML_COND_ISANCHOR = htmlc.wxHTML_COND_ISANCHOR
+wxHTML_COND_ISIMAGEMAP = htmlc.wxHTML_COND_ISIMAGEMAP
+wxHTML_COND_USER = htmlc.wxHTML_COND_USER
+wxPAGE_ODD = htmlc.wxPAGE_ODD
+wxPAGE_EVEN = htmlc.wxPAGE_EVEN
+wxPAGE_ALL = htmlc.wxPAGE_ALL

 
 
 #-------------- USER INCLUDE -----------------------
 
 
 #-------------- USER INCLUDE -----------------------


@@ -551,7 +730,7 @@ HTML_COND_USER = htmlc.HTML_COND_USER
 
 # Stuff these names into the wx namespace so wxPyConstructObject can find them
 import wx
 
 # Stuff these names into the wx namespace so wxPyConstructObject can find them
 import wx

-wx.wxHtmlTagPtr             = wxHtmlTag
+wx.wxHtmlTagPtr             = wxHtmlTagPtr

 wx.wxHtmlParserPtr          = wxHtmlParserPtr
 wx.wxHtmlWinParserPtr       = wxHtmlWinParserPtr
 wx.wxHtmlTagHandlerPtr      = wxHtmlTagHandlerPtr
 wx.wxHtmlParserPtr          = wxHtmlParserPtr
 wx.wxHtmlWinParserPtr       = wxHtmlWinParserPtr
 wx.wxHtmlTagHandlerPtr      = wxHtmlTagHandlerPtr


@@ -559,5 +738,6 @@ wx.wxHtmlWinTagHandlerPtr   = wxHtmlWinTagHandlerPtr
 wx.wxHtmlCellPtr            = wxHtmlCellPtr
 wx.wxHtmlContainerCellPtr   = wxHtmlContainerCellPtr
 wx.wxHtmlWidgetCellPtr      = wxHtmlWidgetCellPtr
 wx.wxHtmlCellPtr            = wxHtmlCellPtr
 wx.wxHtmlContainerCellPtr   = wxHtmlContainerCellPtr
 wx.wxHtmlWidgetCellPtr      = wxHtmlWidgetCellPtr

-wx.HtmlHistoryItemPtr     = HtmlHistoryItemPtr
+wx.HtmlHistoryItemPtr       = HtmlHistoryItemPtr

 wx.wxHtmlWindowPtr          = wxHtmlWindowPtr
 wx.wxHtmlWindowPtr          = wxHtmlWindowPtr

+wx.wxHtmlLinkInfoPtr        = wxHtmlLinkInfoPtr