Patch #1428181: Sample wxProject.py updated

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

diff --git a/wxPython/wxPython/html.py b/wxPython/wxPython/html.py
index adc69f869fc52e0c83f419416dc24a29773d05ed..562f637b824f837f9439346032768a59640f47c3 100644 (file)
--- a/wxPython/wxPython/html.py
+++ b/wxPython/wxPython/html.py
@@ -68,8 +68,10 @@ wxHtmlWinParser = wx.html.HtmlWinParser
 wxHtmlWinParserPtr = wx.html.HtmlWinParserPtr
 wxHtmlTagHandler = wx.html.HtmlTagHandler
 wxHtmlTagHandlerPtr = wx.html.HtmlTagHandlerPtr
 wxHtmlWinParserPtr = wx.html.HtmlWinParserPtr
 wxHtmlTagHandler = wx.html.HtmlTagHandler
 wxHtmlTagHandlerPtr = wx.html.HtmlTagHandlerPtr

+wxHtmlTagHandler = wx.html.HtmlTagHandler

 wxHtmlWinTagHandler = wx.html.HtmlWinTagHandler
 wxHtmlWinTagHandlerPtr = wx.html.HtmlWinTagHandlerPtr
 wxHtmlWinTagHandler = wx.html.HtmlWinTagHandler
 wxHtmlWinTagHandlerPtr = wx.html.HtmlWinTagHandlerPtr

+wxHtmlWinTagHandler = wx.html.HtmlWinTagHandler

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


@@ -101,8 +103,10 @@ wxHtmlWidgetCell = wx.html.HtmlWidgetCell
 wxHtmlWidgetCellPtr = wx.html.HtmlWidgetCellPtr
 wxHtmlFilter = wx.html.HtmlFilter
 wxHtmlFilterPtr = wx.html.HtmlFilterPtr
 wxHtmlWidgetCellPtr = wx.html.HtmlWidgetCellPtr
 wxHtmlFilter = wx.html.HtmlFilter
 wxHtmlFilterPtr = wx.html.HtmlFilterPtr

+wxHtmlFilter = wx.html.HtmlFilter

 wxHtmlWindow = wx.html.HtmlWindow
 wxHtmlWindowPtr = wx.html.HtmlWindowPtr
 wxHtmlWindow = wx.html.HtmlWindow
 wxHtmlWindowPtr = wx.html.HtmlWindowPtr

+wxHtmlWindow = wx.html.HtmlWindow

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


@@ -119,24 +123,68 @@ wxHtmlEasyPrinting = wx.html.HtmlEasyPrinting
 wxHtmlEasyPrintingPtr = wx.html.HtmlEasyPrintingPtr
 wxHtmlBookRecord = wx.html.HtmlBookRecord
 wxHtmlBookRecordPtr = wx.html.HtmlBookRecordPtr
 wxHtmlEasyPrintingPtr = wx.html.HtmlEasyPrintingPtr
 wxHtmlBookRecord = wx.html.HtmlBookRecord
 wxHtmlBookRecordPtr = wx.html.HtmlBookRecordPtr

-wxHtmlContentsItem = wx.html.HtmlContentsItem
-wxHtmlContentsItemPtr = wx.html.HtmlContentsItemPtr

 wxHtmlSearchStatus = wx.html.HtmlSearchStatus
 wxHtmlSearchStatusPtr = wx.html.HtmlSearchStatusPtr
 wxHtmlHelpData = wx.html.HtmlHelpData
 wxHtmlHelpDataPtr = wx.html.HtmlHelpDataPtr
 wxHtmlSearchStatus = wx.html.HtmlSearchStatus
 wxHtmlSearchStatusPtr = wx.html.HtmlSearchStatusPtr
 wxHtmlHelpData = wx.html.HtmlHelpData
 wxHtmlHelpDataPtr = wx.html.HtmlHelpDataPtr

-wxHtmlHelpFrame = wx.html.HtmlHelpFrame
-wxHtmlHelpFramePtr = wx.html.HtmlHelpFramePtr

 wxHF_TOOLBAR = wx.html.HF_TOOLBAR
 wxHF_TOOLBAR = wx.html.HF_TOOLBAR

-wxHF_FLATTOOLBAR = wx.html.HF_FLATTOOLBAR

 wxHF_CONTENTS = wx.html.HF_CONTENTS
 wxHF_INDEX = wx.html.HF_INDEX
 wxHF_SEARCH = wx.html.HF_SEARCH
 wxHF_BOOKMARKS = wx.html.HF_BOOKMARKS
 wxHF_CONTENTS = wx.html.HF_CONTENTS
 wxHF_INDEX = wx.html.HF_INDEX
 wxHF_SEARCH = wx.html.HF_SEARCH
 wxHF_BOOKMARKS = wx.html.HF_BOOKMARKS

-wxHF_OPENFILES = wx.html.HF_OPENFILES
+wxHF_OPEN_FILES = wx.html.HF_OPEN_FILES

 wxHF_PRINT = wx.html.HF_PRINT
 wxHF_PRINT = wx.html.HF_PRINT

-wxHF_DEFAULTSTYLE = wx.html.HF_DEFAULTSTYLE
+wxHF_FLAT_TOOLBAR = wx.html.HF_FLAT_TOOLBAR
+wxHF_MERGE_BOOKS = wx.html.HF_MERGE_BOOKS
+wxHF_ICONS_BOOK = wx.html.HF_ICONS_BOOK
+wxHF_ICONS_BOOK_CHAPTER = wx.html.HF_ICONS_BOOK_CHAPTER
+wxHF_ICONS_FOLDER = wx.html.HF_ICONS_FOLDER
+wxHF_DEFAULT_STYLE = wx.html.HF_DEFAULT_STYLE
+wxHF_EMBEDDED = wx.html.HF_EMBEDDED
+wxHF_DIALOG = wx.html.HF_DIALOG
+wxHF_FRAME = wx.html.HF_FRAME
+wxHF_MODAL = wx.html.HF_MODAL
+wxID_HTML_PANEL = wx.html.ID_HTML_PANEL
+wxID_HTML_BACK = wx.html.ID_HTML_BACK
+wxID_HTML_FORWARD = wx.html.ID_HTML_FORWARD
+wxID_HTML_UPNODE = wx.html.ID_HTML_UPNODE
+wxID_HTML_UP = wx.html.ID_HTML_UP
+wxID_HTML_DOWN = wx.html.ID_HTML_DOWN
+wxID_HTML_PRINT = wx.html.ID_HTML_PRINT
+wxID_HTML_OPENFILE = wx.html.ID_HTML_OPENFILE
+wxID_HTML_OPTIONS = wx.html.ID_HTML_OPTIONS
+wxID_HTML_BOOKMARKSLIST = wx.html.ID_HTML_BOOKMARKSLIST
+wxID_HTML_BOOKMARKSADD = wx.html.ID_HTML_BOOKMARKSADD
+wxID_HTML_BOOKMARKSREMOVE = wx.html.ID_HTML_BOOKMARKSREMOVE
+wxID_HTML_TREECTRL = wx.html.ID_HTML_TREECTRL
+wxID_HTML_INDEXPAGE = wx.html.ID_HTML_INDEXPAGE
+wxID_HTML_INDEXLIST = wx.html.ID_HTML_INDEXLIST
+wxID_HTML_INDEXTEXT = wx.html.ID_HTML_INDEXTEXT
+wxID_HTML_INDEXBUTTON = wx.html.ID_HTML_INDEXBUTTON
+wxID_HTML_INDEXBUTTONALL = wx.html.ID_HTML_INDEXBUTTONALL
+wxID_HTML_NOTEBOOK = wx.html.ID_HTML_NOTEBOOK
+wxID_HTML_SEARCHPAGE = wx.html.ID_HTML_SEARCHPAGE
+wxID_HTML_SEARCHTEXT = wx.html.ID_HTML_SEARCHTEXT
+wxID_HTML_SEARCHLIST = wx.html.ID_HTML_SEARCHLIST
+wxID_HTML_SEARCHBUTTON = wx.html.ID_HTML_SEARCHBUTTON
+wxID_HTML_SEARCHCHOICE = wx.html.ID_HTML_SEARCHCHOICE
+wxID_HTML_COUNTINFO = wx.html.ID_HTML_COUNTINFO
+wxHtmlHelpWindow = wx.html.HtmlHelpWindow
+wxHtmlHelpWindowPtr = wx.html.HtmlHelpWindowPtr
+wxPreHtmlHelpWindow = wx.html.PreHtmlHelpWindow
+wxHtmlWindowEvent = wx.html.HtmlWindowEvent
+wxHtmlWindowEventPtr = wx.html.HtmlWindowEventPtr
+wxHtmlHelpFrame = wx.html.HtmlHelpFrame
+wxHtmlHelpFramePtr = wx.html.HtmlHelpFramePtr
+wxPreHtmlHelpFrame = wx.html.PreHtmlHelpFrame
+wxHtmlHelpDialog = wx.html.HtmlHelpDialog
+wxHtmlHelpDialogPtr = wx.html.HtmlHelpDialogPtr
+wxPreHtmlHelpDialog = wx.html.PreHtmlHelpDialog
+wxHelpControllerBase = wx.html.HelpControllerBase
+wxHelpControllerBasePtr = wx.html.HelpControllerBasePtr

 wxHtmlHelpController = wx.html.HtmlHelpController
 wxHtmlHelpControllerPtr = wx.html.HtmlHelpControllerPtr
 wxHtmlHelpController = wx.html.HtmlHelpController
 wxHtmlHelpControllerPtr = wx.html.HtmlHelpControllerPtr

+wxHtmlModalHelp = wx.html.HtmlModalHelp
+wxHtmlModalHelpPtr = wx.html.HtmlModalHelpPtr