X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/012f2cb2519bca1bffc5d80335320fd94594ab1d..01e4ec19805f0decf6adde30a9f77b03340d60b5:/samples/help/demo.cpp diff --git a/samples/help/demo.cpp b/samples/help/demo.cpp index bc7e926b8d..f88a1650bc 100644 --- a/samples/help/demo.cpp +++ b/samples/help/demo.cpp @@ -44,9 +44,6 @@ #define USE_HTML_HELP 1 -// Use old-style HTML help if 1 -#define USE_OLD_HTML_HELP 0 - #if !wxUSE_HTML #undef USE_HTML_HELP #define USE_HTML_HELP 0 @@ -56,10 +53,6 @@ #include "wx/filesys.h" #include "wx/fs_zip.h" -#if USE_OLD_HTML_HELP -#include "wx/generic/helpwxht.h" -#endif - #include "wx/html/helpctrl.h" #endif @@ -75,7 +68,7 @@ // ressources // ---------------------------------------------------------------------------- // the application icon -#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) +#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) #include "mondrian.xpm" #endif @@ -109,9 +102,6 @@ public: wxHelpController& GetHelpController() { return m_help; } #if USE_HTML_HELP -#if USE_OLD_HTML_HELP - wxHelpControllerHtml& GetHtmlHelpController() { return m_htmlHelp; } -#endif wxHtmlHelpController& GetAdvancedHtmlHelpController() { return m_advancedHtmlHelp; } #endif #if wxUSE_MS_HTML_HELP @@ -124,7 +114,6 @@ public: // event handlers (these functions should _not_ be virtual) void OnQuit(wxCommandEvent& event); void OnHelp(wxCommandEvent& event); - void OnHtmlHelp(wxCommandEvent& event); void OnAdvancedHtmlHelp(wxCommandEvent& event); void OnMSHtmlHelp(wxCommandEvent& event); void OnBestHelp(wxCommandEvent& event); @@ -138,9 +127,6 @@ private: wxHelpController m_help; #if USE_HTML_HELP -#if USE_OLD_HTML_HELP - wxHelpControllerHtml m_htmlHelp; -#endif wxHtmlHelpController m_advancedHtmlHelp; #endif @@ -232,12 +218,6 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(HelpDemo_Help_ContextHelp, MyFrame::OnShowContextHelp) EVT_MENU(HelpDemo_Help_DialogContextHelp, MyFrame::OnShowDialogContextHelp) - EVT_MENU(HelpDemo_Html_Help_Index, MyFrame::OnHtmlHelp) - EVT_MENU(HelpDemo_Html_Help_Classes, MyFrame::OnHtmlHelp) - EVT_MENU(HelpDemo_Html_Help_Functions, MyFrame::OnHtmlHelp) - EVT_MENU(HelpDemo_Html_Help_Help, MyFrame::OnHtmlHelp) - EVT_MENU(HelpDemo_Html_Help_Search, MyFrame::OnHtmlHelp) - EVT_MENU(HelpDemo_Advanced_Html_Help_Index, MyFrame::OnAdvancedHtmlHelp) EVT_MENU(HelpDemo_Advanced_Html_Help_Classes, MyFrame::OnAdvancedHtmlHelp) EVT_MENU(HelpDemo_Advanced_Html_Help_Functions, MyFrame::OnAdvancedHtmlHelp) @@ -333,17 +313,6 @@ bool MyApp::OnInit() #endif #if USE_HTML_HELP - // initialise the standard HTML help system: this means that the HTML docs are in the - // subdirectory doc for platforms using HTML help -#if USE_OLD_HTML_HELP - if ( !frame->GetHtmlHelpController().Initialize("doc") ) - { - wxLogError(wxT("Cannot initialize the HTML help system, aborting.")); - - return FALSE; - } -#endif - // initialise the advanced HTML help system: this means that the HTML docs are in .htb // (zipped) form if ( !frame->GetAdvancedHtmlHelpController().Initialize("doc") ) @@ -398,14 +367,6 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) menuFile->Append(HelpDemo_Help_Help, "&About Help Demo..."); menuFile->Append(HelpDemo_Help_Search, "&Search help..."); #if USE_HTML_HELP -#if USE_OLD_HTML_HELP - menuFile->AppendSeparator(); - menuFile->Append(HelpDemo_Html_Help_Index, "HTML &Help Index..."); - menuFile->Append(HelpDemo_Html_Help_Classes, "HTML &Help on Classes..."); - menuFile->Append(HelpDemo_Html_Help_Functions, "HTML &Help on Functions..."); - menuFile->Append(HelpDemo_Html_Help_Help, "HTML &About Help Demo..."); - menuFile->Append(HelpDemo_Html_Help_Search, "HTML &Search help..."); -#endif menuFile->AppendSeparator(); menuFile->Append(HelpDemo_Advanced_Html_Help_Index, "Advanced HTML &Help Index..."); menuFile->Append(HelpDemo_Advanced_Html_Help_Classes, "Advanced HTML &Help on Classes..."); @@ -490,13 +451,6 @@ void MyFrame::OnShowDialogContextHelp(wxCommandEvent& event) dialog.ShowModal(); } -void MyFrame::OnHtmlHelp(wxCommandEvent& event) -{ -#if USE_HTML_HELP && USE_OLD_HTML_HELP - ShowHelp(event.GetId(), m_htmlHelp); -#endif -} - void MyFrame::OnAdvancedHtmlHelp(wxCommandEvent& event) { #if USE_HTML_HELP @@ -589,67 +543,66 @@ void MyFrame::ShowHelp(int commandId, wxHelpControllerBase& helpController) { switch(commandId) { - case HelpDemo_Help_Classes: - case HelpDemo_Html_Help_Classes: - case HelpDemo_Advanced_Html_Help_Classes: - case HelpDemo_MS_Html_Help_Classes: - case HelpDemo_Best_Help_Classes: - helpController.DisplaySection(2); - //helpController.DisplaySection("Classes"); // An alternative form for most controllers - - break; - case HelpDemo_Help_Functions: - case HelpDemo_Html_Help_Functions: - case HelpDemo_Advanced_Html_Help_Functions: - case HelpDemo_MS_Html_Help_Functions: - helpController.DisplaySection(1); - //helpController.DisplaySection("Functions"); // An alternative form for most controllers - break; - case HelpDemo_Help_Help: - case HelpDemo_Html_Help_Help: - case HelpDemo_Advanced_Html_Help_Help: - case HelpDemo_MS_Html_Help_Help: - case HelpDemo_Best_Help_Help: - helpController.DisplaySection(3); - //helpController.DisplaySection("About"); // An alternative form for most controllers - break; - - case HelpDemo_Help_Search: - case HelpDemo_Html_Help_Search: - case HelpDemo_Advanced_Html_Help_Search: - case HelpDemo_MS_Html_Help_Search: - case HelpDemo_Best_Help_Search: - { - wxString key = wxGetTextFromUser("Search for?", - "Search help for keyword", - "", - this); - if(! key.IsEmpty()) - helpController.KeywordSearch(key); - } - break; - - case HelpDemo_Help_Index: - case HelpDemo_Html_Help_Index: - case HelpDemo_Advanced_Html_Help_Index: - case HelpDemo_MS_Html_Help_Index: - case HelpDemo_Best_Help_Index: - helpController.DisplayContents(); - break; - - // These three calls are only used by wxExtHelpController - - case HelpDemo_Help_KDE: - helpController.SetViewer("kdehelp"); - break; - case HelpDemo_Help_GNOME: - helpController.SetViewer("gnome-help-browser"); - break; - case HelpDemo_Help_Netscape: - helpController.SetViewer("netscape", wxHELP_NETSCAPE); - break; - default: - break; + case HelpDemo_Help_Classes: + case HelpDemo_Html_Help_Classes: + case HelpDemo_Advanced_Html_Help_Classes: + case HelpDemo_MS_Html_Help_Classes: + case HelpDemo_Best_Help_Classes: + helpController.DisplaySection(2); + //helpController.DisplaySection("Classes"); // An alternative form for most controllers + break; + + case HelpDemo_Help_Functions: + case HelpDemo_Html_Help_Functions: + case HelpDemo_Advanced_Html_Help_Functions: + case HelpDemo_MS_Html_Help_Functions: + helpController.DisplaySection(1); + //helpController.DisplaySection("Functions"); // An alternative form for most controllers + break; + + case HelpDemo_Help_Help: + case HelpDemo_Html_Help_Help: + case HelpDemo_Advanced_Html_Help_Help: + case HelpDemo_MS_Html_Help_Help: + case HelpDemo_Best_Help_Help: + helpController.DisplaySection(3); + //helpController.DisplaySection("About"); // An alternative form for most controllers + break; + + case HelpDemo_Help_Search: + case HelpDemo_Html_Help_Search: + case HelpDemo_Advanced_Html_Help_Search: + case HelpDemo_MS_Html_Help_Search: + case HelpDemo_Best_Help_Search: + { + wxString key = wxGetTextFromUser("Search for?", + "Search help for keyword", + "", + this); + if(! key.IsEmpty()) + helpController.KeywordSearch(key); + } + break; + + case HelpDemo_Help_Index: + case HelpDemo_Html_Help_Index: + case HelpDemo_Advanced_Html_Help_Index: + case HelpDemo_MS_Html_Help_Index: + case HelpDemo_Best_Help_Index: + helpController.DisplayContents(); + break; + + // These three calls are only used by wxExtHelpController + + case HelpDemo_Help_KDE: + helpController.SetViewer("kdehelp"); + break; + case HelpDemo_Help_GNOME: + helpController.SetViewer("gnome-help-browser"); + break; + case HelpDemo_Help_Netscape: + helpController.SetViewer("netscape", wxHELP_NETSCAPE); + break; } }