Further compile fixes.

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

diff --git a/wxPython/wxPython/html.py b/wxPython/wxPython/html.py
index a62f09db09651276b4dbc2b6845add401798b24d..adc69f869fc52e0c83f419416dc24a29773d05ed 100644 (file)
--- a/wxPython/wxPython/html.py
+++ b/wxPython/wxPython/html.py
@@ -1,7 +1,7 @@
 ## This file reverse renames symbols in the wx package to give
 ## them their wx prefix again, for backwards compatibility.
 ##
 ## This file reverse renames symbols in the wx package to give
 ## them their wx prefix again, for backwards compatibility.
 ##

-## Generated by ./distrib/build_renamers.py
+## Generated by BuildRenamers in config.py

 
 # This silly stuff here is so the wxPython.wx module doesn't conflict
 # with the wx package.  We need to import modules from the wx package
 
 # This silly stuff here is so the wxPython.wx module doesn't conflict
 # with the wx package.  We need to import modules from the wx package


@@ -19,6 +19,9 @@ del sys, _wx
 
 
 # Now assign all the reverse-renamed names:
 
 
 # Now assign all the reverse-renamed names:

+wxHtmlWindowNameStr = wx.html.HtmlWindowNameStr
+wxHtmlPrintoutTitleStr = wx.html.HtmlPrintoutTitleStr
+wxHtmlPrintingTitleStr = wx.html.HtmlPrintingTitleStr

 wxHTML_ALIGN_LEFT = wx.html.HTML_ALIGN_LEFT
 wxHTML_ALIGN_CENTER = wx.html.HTML_ALIGN_CENTER
 wxHTML_ALIGN_RIGHT = wx.html.HTML_ALIGN_RIGHT
 wxHTML_ALIGN_LEFT = wx.html.HTML_ALIGN_LEFT
 wxHTML_ALIGN_CENTER = wx.html.HTML_ALIGN_CENTER
 wxHTML_ALIGN_RIGHT = wx.html.HTML_ALIGN_RIGHT


@@ -56,46 +59,74 @@ wxHTML_URL_PAGE = wx.html.HTML_URL_PAGE
 wxHTML_URL_IMAGE = wx.html.HTML_URL_IMAGE
 wxHTML_URL_OTHER = wx.html.HTML_URL_OTHER
 wxHtmlLinkInfo = wx.html.HtmlLinkInfo
 wxHTML_URL_IMAGE = wx.html.HTML_URL_IMAGE
 wxHTML_URL_OTHER = wx.html.HTML_URL_OTHER
 wxHtmlLinkInfo = wx.html.HtmlLinkInfo

+wxHtmlLinkInfoPtr = wx.html.HtmlLinkInfoPtr

 wxHtmlTag = wx.html.HtmlTag
 wxHtmlTag = wx.html.HtmlTag

+wxHtmlTagPtr = wx.html.HtmlTagPtr

 wxHtmlParser = wx.html.HtmlParser
 wxHtmlParser = wx.html.HtmlParser

+wxHtmlParserPtr = wx.html.HtmlParserPtr

 wxHtmlWinParser = wx.html.HtmlWinParser
 wxHtmlWinParser = wx.html.HtmlWinParser

+wxHtmlWinParserPtr = wx.html.HtmlWinParserPtr

 wxHtmlTagHandler = wx.html.HtmlTagHandler
 wxHtmlTagHandler = wx.html.HtmlTagHandler

+wxHtmlTagHandlerPtr = wx.html.HtmlTagHandlerPtr

 wxHtmlWinTagHandler = wx.html.HtmlWinTagHandler
 wxHtmlWinTagHandler = wx.html.HtmlWinTagHandler

+wxHtmlWinTagHandlerPtr = wx.html.HtmlWinTagHandlerPtr

 wxHtmlWinParser_AddTagHandler = wx.html.HtmlWinParser_AddTagHandler
 wxHtmlSelection = wx.html.HtmlSelection
 wxHtmlWinParser_AddTagHandler = wx.html.HtmlWinParser_AddTagHandler
 wxHtmlSelection = wx.html.HtmlSelection

+wxHtmlSelectionPtr = wx.html.HtmlSelectionPtr

 wxHTML_SEL_OUT = wx.html.HTML_SEL_OUT
 wxHTML_SEL_IN = wx.html.HTML_SEL_IN
 wxHTML_SEL_CHANGING = wx.html.HTML_SEL_CHANGING
 wxHtmlRenderingState = wx.html.HtmlRenderingState
 wxHTML_SEL_OUT = wx.html.HTML_SEL_OUT
 wxHTML_SEL_IN = wx.html.HTML_SEL_IN
 wxHTML_SEL_CHANGING = wx.html.HTML_SEL_CHANGING
 wxHtmlRenderingState = wx.html.HtmlRenderingState

+wxHtmlRenderingStatePtr = wx.html.HtmlRenderingStatePtr

 wxHtmlRenderingStyle = wx.html.HtmlRenderingStyle
 wxHtmlRenderingStyle = wx.html.HtmlRenderingStyle

+wxHtmlRenderingStylePtr = wx.html.HtmlRenderingStylePtr

 wxDefaultHtmlRenderingStyle = wx.html.DefaultHtmlRenderingStyle
 wxDefaultHtmlRenderingStyle = wx.html.DefaultHtmlRenderingStyle

+wxDefaultHtmlRenderingStylePtr = wx.html.DefaultHtmlRenderingStylePtr

 wxHtmlRenderingInfo = wx.html.HtmlRenderingInfo
 wxHtmlRenderingInfo = wx.html.HtmlRenderingInfo

+wxHtmlRenderingInfoPtr = wx.html.HtmlRenderingInfoPtr

 wxHTML_FIND_EXACT = wx.html.HTML_FIND_EXACT
 wxHTML_FIND_NEAREST_BEFORE = wx.html.HTML_FIND_NEAREST_BEFORE
 wxHTML_FIND_NEAREST_AFTER = wx.html.HTML_FIND_NEAREST_AFTER
 wxHtmlCell = wx.html.HtmlCell
 wxHTML_FIND_EXACT = wx.html.HTML_FIND_EXACT
 wxHTML_FIND_NEAREST_BEFORE = wx.html.HTML_FIND_NEAREST_BEFORE
 wxHTML_FIND_NEAREST_AFTER = wx.html.HTML_FIND_NEAREST_AFTER
 wxHtmlCell = wx.html.HtmlCell

+wxHtmlCellPtr = wx.html.HtmlCellPtr

 wxHtmlWordCell = wx.html.HtmlWordCell
 wxHtmlWordCell = wx.html.HtmlWordCell

+wxHtmlWordCellPtr = wx.html.HtmlWordCellPtr

 wxHtmlContainerCell = wx.html.HtmlContainerCell
 wxHtmlContainerCell = wx.html.HtmlContainerCell

+wxHtmlContainerCellPtr = wx.html.HtmlContainerCellPtr

 wxHtmlColourCell = wx.html.HtmlColourCell
 wxHtmlColourCell = wx.html.HtmlColourCell

+wxHtmlColourCellPtr = wx.html.HtmlColourCellPtr

 wxHtmlFontCell = wx.html.HtmlFontCell
 wxHtmlFontCell = wx.html.HtmlFontCell

+wxHtmlFontCellPtr = wx.html.HtmlFontCellPtr

 wxHtmlWidgetCell = wx.html.HtmlWidgetCell
 wxHtmlWidgetCell = wx.html.HtmlWidgetCell

+wxHtmlWidgetCellPtr = wx.html.HtmlWidgetCellPtr

 wxHtmlFilter = wx.html.HtmlFilter
 wxHtmlFilter = wx.html.HtmlFilter

+wxHtmlFilterPtr = wx.html.HtmlFilterPtr
+wxHtmlWindow = wx.html.HtmlWindow
+wxHtmlWindowPtr = wx.html.HtmlWindowPtr

 wxPreHtmlWindow = wx.html.PreHtmlWindow
 wxHtmlWindow_AddFilter = wx.html.HtmlWindow_AddFilter
 wxPreHtmlWindow = wx.html.PreHtmlWindow
 wxHtmlWindow_AddFilter = wx.html.HtmlWindow_AddFilter

-wxHtmlWindow = wx.html.HtmlWindow
+wxHtmlWindow_GetClassDefaultAttributes = wx.html.HtmlWindow_GetClassDefaultAttributes

 wxHtmlDCRenderer = wx.html.HtmlDCRenderer
 wxHtmlDCRenderer = wx.html.HtmlDCRenderer

+wxHtmlDCRendererPtr = wx.html.HtmlDCRendererPtr

 wxPAGE_ODD = wx.html.PAGE_ODD
 wxPAGE_EVEN = wx.html.PAGE_EVEN
 wxPAGE_ALL = wx.html.PAGE_ALL
 wxPAGE_ODD = wx.html.PAGE_ODD
 wxPAGE_EVEN = wx.html.PAGE_EVEN
 wxPAGE_ALL = wx.html.PAGE_ALL

+wxHtmlPrintout = wx.html.HtmlPrintout
+wxHtmlPrintoutPtr = wx.html.HtmlPrintoutPtr

 wxHtmlPrintout_AddFilter = wx.html.HtmlPrintout_AddFilter
 wxHtmlPrintout_CleanUpStatics = wx.html.HtmlPrintout_CleanUpStatics
 wxHtmlPrintout_AddFilter = wx.html.HtmlPrintout_AddFilter
 wxHtmlPrintout_CleanUpStatics = wx.html.HtmlPrintout_CleanUpStatics

-wxHtmlPrintout = wx.html.HtmlPrintout

 wxHtmlEasyPrinting = wx.html.HtmlEasyPrinting
 wxHtmlEasyPrinting = wx.html.HtmlEasyPrinting

+wxHtmlEasyPrintingPtr = wx.html.HtmlEasyPrintingPtr

 wxHtmlBookRecord = wx.html.HtmlBookRecord
 wxHtmlBookRecord = wx.html.HtmlBookRecord

+wxHtmlBookRecordPtr = wx.html.HtmlBookRecordPtr

 wxHtmlContentsItem = wx.html.HtmlContentsItem
 wxHtmlContentsItem = wx.html.HtmlContentsItem

+wxHtmlContentsItemPtr = wx.html.HtmlContentsItemPtr

 wxHtmlSearchStatus = wx.html.HtmlSearchStatus
 wxHtmlSearchStatus = wx.html.HtmlSearchStatus

+wxHtmlSearchStatusPtr = wx.html.HtmlSearchStatusPtr

 wxHtmlHelpData = wx.html.HtmlHelpData
 wxHtmlHelpData = wx.html.HtmlHelpData

+wxHtmlHelpDataPtr = wx.html.HtmlHelpDataPtr

 wxHtmlHelpFrame = wx.html.HtmlHelpFrame
 wxHtmlHelpFrame = wx.html.HtmlHelpFrame

+wxHtmlHelpFramePtr = wx.html.HtmlHelpFramePtr

 wxHF_TOOLBAR = wx.html.HF_TOOLBAR
 wxHF_FLATTOOLBAR = wx.html.HF_FLATTOOLBAR
 wxHF_CONTENTS = wx.html.HF_CONTENTS
 wxHF_TOOLBAR = wx.html.HF_TOOLBAR
 wxHF_FLATTOOLBAR = wx.html.HF_FLATTOOLBAR
 wxHF_CONTENTS = wx.html.HF_CONTENTS


@@ -106,5 +137,6 @@ wxHF_OPENFILES = wx.html.HF_OPENFILES
 wxHF_PRINT = wx.html.HF_PRINT
 wxHF_DEFAULTSTYLE = wx.html.HF_DEFAULTSTYLE
 wxHtmlHelpController = wx.html.HtmlHelpController
 wxHF_PRINT = wx.html.HF_PRINT
 wxHF_DEFAULTSTYLE = wx.html.HF_DEFAULTSTYLE
 wxHtmlHelpController = wx.html.HtmlHelpController

+wxHtmlHelpControllerPtr = wx.html.HtmlHelpControllerPtr