removed Julian's hack that is no longer needed after wxBitmap stubs were added even...

[wxWidgets.git] / wxPython / src / _html_rename.i

diff --git a/wxPython/src/_html_rename.i b/wxPython/src/_html_rename.i
index 2322fcaf60c0d597b440e46fc1ebeea0b3b3a714..009d91b72099c6fb80462c0b9c24f32ffd586314 100644 (file)
--- a/wxPython/src/_html_rename.i
+++ b/wxPython/src/_html_rename.i
@@ -70,16 +70,54 @@
 %rename(HtmlBookRecord)                     wxHtmlBookRecord;
 %rename(HtmlSearchStatus)                   wxHtmlSearchStatus;
 %rename(HtmlHelpData)                       wxHtmlHelpData;
 %rename(HtmlBookRecord)                     wxHtmlBookRecord;
 %rename(HtmlSearchStatus)                   wxHtmlSearchStatus;
 %rename(HtmlHelpData)                       wxHtmlHelpData;

-%rename(HtmlHelpFrame)                      wxHtmlHelpFrame;

 %rename(HF_TOOLBAR)                         wxHF_TOOLBAR;
 %rename(HF_TOOLBAR)                         wxHF_TOOLBAR;

-%rename(HF_FLATTOOLBAR)                     wxHF_FLATTOOLBAR;

 %rename(HF_CONTENTS)                        wxHF_CONTENTS;
 %rename(HF_INDEX)                           wxHF_INDEX;
 %rename(HF_SEARCH)                          wxHF_SEARCH;
 %rename(HF_BOOKMARKS)                       wxHF_BOOKMARKS;
 %rename(HF_CONTENTS)                        wxHF_CONTENTS;
 %rename(HF_INDEX)                           wxHF_INDEX;
 %rename(HF_SEARCH)                          wxHF_SEARCH;
 %rename(HF_BOOKMARKS)                       wxHF_BOOKMARKS;

-%rename(HF_OPENFILES)                       wxHF_OPENFILES;
+%rename(HF_OPEN_FILES)                      wxHF_OPEN_FILES;

 %rename(HF_PRINT)                           wxHF_PRINT;
 %rename(HF_PRINT)                           wxHF_PRINT;

-%rename(HF_DEFAULTSTYLE)                    wxHF_DEFAULTSTYLE;
+%rename(HF_FLAT_TOOLBAR)                    wxHF_FLAT_TOOLBAR;
+%rename(HF_MERGE_BOOKS)                     wxHF_MERGE_BOOKS;
+%rename(HF_ICONS_BOOK)                      wxHF_ICONS_BOOK;
+%rename(HF_ICONS_BOOK_CHAPTER)              wxHF_ICONS_BOOK_CHAPTER;
+%rename(HF_ICONS_FOLDER)                    wxHF_ICONS_FOLDER;
+%rename(HF_DEFAULT_STYLE)                   wxHF_DEFAULT_STYLE;
+%rename(HF_EMBEDDED)                        wxHF_EMBEDDED;
+%rename(HF_DIALOG)                          wxHF_DIALOG;
+%rename(HF_FRAME)                           wxHF_FRAME;
+%rename(HF_MODAL)                           wxHF_MODAL;
+%rename(ID_HTML_PANEL)                      wxID_HTML_PANEL;
+%rename(ID_HTML_BACK)                       wxID_HTML_BACK;
+%rename(ID_HTML_FORWARD)                    wxID_HTML_FORWARD;
+%rename(ID_HTML_UPNODE)                     wxID_HTML_UPNODE;
+%rename(ID_HTML_UP)                         wxID_HTML_UP;
+%rename(ID_HTML_DOWN)                       wxID_HTML_DOWN;
+%rename(ID_HTML_PRINT)                      wxID_HTML_PRINT;
+%rename(ID_HTML_OPENFILE)                   wxID_HTML_OPENFILE;
+%rename(ID_HTML_OPTIONS)                    wxID_HTML_OPTIONS;
+%rename(ID_HTML_BOOKMARKSLIST)              wxID_HTML_BOOKMARKSLIST;
+%rename(ID_HTML_BOOKMARKSADD)               wxID_HTML_BOOKMARKSADD;
+%rename(ID_HTML_BOOKMARKSREMOVE)            wxID_HTML_BOOKMARKSREMOVE;
+%rename(ID_HTML_TREECTRL)                   wxID_HTML_TREECTRL;
+%rename(ID_HTML_INDEXPAGE)                  wxID_HTML_INDEXPAGE;
+%rename(ID_HTML_INDEXLIST)                  wxID_HTML_INDEXLIST;
+%rename(ID_HTML_INDEXTEXT)                  wxID_HTML_INDEXTEXT;
+%rename(ID_HTML_INDEXBUTTON)                wxID_HTML_INDEXBUTTON;
+%rename(ID_HTML_INDEXBUTTONALL)             wxID_HTML_INDEXBUTTONALL;
+%rename(ID_HTML_NOTEBOOK)                   wxID_HTML_NOTEBOOK;
+%rename(ID_HTML_SEARCHPAGE)                 wxID_HTML_SEARCHPAGE;
+%rename(ID_HTML_SEARCHTEXT)                 wxID_HTML_SEARCHTEXT;
+%rename(ID_HTML_SEARCHLIST)                 wxID_HTML_SEARCHLIST;
+%rename(ID_HTML_SEARCHBUTTON)               wxID_HTML_SEARCHBUTTON;
+%rename(ID_HTML_SEARCHCHOICE)               wxID_HTML_SEARCHCHOICE;
+%rename(ID_HTML_COUNTINFO)                  wxID_HTML_COUNTINFO;
+%rename(HtmlHelpWindow)                     wxHtmlHelpWindow;
+%rename(HtmlWindowEvent)                    wxHtmlWindowEvent;
+%rename(HtmlHelpFrame)                      wxHtmlHelpFrame;
+%rename(HtmlHelpDialog)                     wxHtmlHelpDialog;
+%rename(HelpControllerBase)                 wxHelpControllerBase;

 %rename(HtmlHelpController)                 wxHtmlHelpController;
 %rename(HtmlHelpController)                 wxHtmlHelpController;

+%rename(HtmlModalHelp)                      wxHtmlModalHelp;

 
 #endif
 
 #endif