X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83661a1347733ddad2a7c264f920658e3095ff13..c9468a241baaa09bbc82eb45da40a1d15c630f4d:/samples/help/demo.cpp?ds=sidebyside diff --git a/samples/help/demo.cpp b/samples/help/demo.cpp index 3c43002659..55b9352df0 100644 --- a/samples/help/demo.cpp +++ b/samples/help/demo.cpp @@ -53,8 +53,8 @@ #endif #if USE_HTML_HELP -#include -#include +#include "wx/filesys.h" +#include "wx/fs_zip.h" #if USE_OLD_HTML_HELP #include "wx/generic/helpwxht.h" @@ -67,11 +67,15 @@ #include "wx/msw/helpchm.h" #endif +#if wxUSE_MS_HTML_HELP && wxUSE_WXHTML_HELP +#include "wx/msw/helpbest.h" +#endif + // ---------------------------------------------------------------------------- // ressources // ---------------------------------------------------------------------------- // the application icon -#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) +#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) #include "mondrian.xpm" #endif @@ -113,6 +117,9 @@ public: #if wxUSE_MS_HTML_HELP wxCHMHelpController& GetMSHtmlHelpController() { return m_msHtmlHelp; } #endif +#if wxUSE_MS_HTML_HELP && wxUSE_WXHTML_HELP + wxBestHelpController& GetBestHelpController() { return m_bestHelp; } +#endif // event handlers (these functions should _not_ be virtual) void OnQuit(wxCommandEvent& event); @@ -120,6 +127,7 @@ public: void OnHtmlHelp(wxCommandEvent& event); void OnAdvancedHtmlHelp(wxCommandEvent& event); void OnMSHtmlHelp(wxCommandEvent& event); + void OnBestHelp(wxCommandEvent& event); void OnShowContextHelp(wxCommandEvent& event); void OnShowDialogContextHelp(wxCommandEvent& event); @@ -140,6 +148,10 @@ private: wxCHMHelpController m_msHtmlHelp; #endif +#if wxUSE_MS_HTML_HELP && wxUSE_WXHTML_HELP + wxBestHelpController m_bestHelp; +#endif + // any class wishing to process wxWindows events must use this macro DECLARE_EVENT_TABLE() }; @@ -190,6 +202,12 @@ enum HelpDemo_MS_Html_Help_Help, HelpDemo_MS_Html_Help_Search, + HelpDemo_Best_Help_Index, + HelpDemo_Best_Help_Classes, + HelpDemo_Best_Help_Functions, + HelpDemo_Best_Help_Help, + HelpDemo_Best_Help_Search, + HelpDemo_Help_KDE, HelpDemo_Help_GNOME, HelpDemo_Help_Netscape, @@ -232,6 +250,8 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(HelpDemo_MS_Html_Help_Help, MyFrame::OnMSHtmlHelp) EVT_MENU(HelpDemo_MS_Html_Help_Search, MyFrame::OnMSHtmlHelp) + EVT_MENU(HelpDemo_Best_Help_Index, MyFrame::OnBestHelp) + EVT_MENU(HelpDemo_Help_KDE, MyFrame::OnHelp) EVT_MENU(HelpDemo_Help_GNOME, MyFrame::OnHelp) EVT_MENU(HelpDemo_Help_Netscape, MyFrame::OnHelp) @@ -292,18 +312,33 @@ bool MyApp::OnInit() // using HTML help if ( !frame->GetHelpController().Initialize("doc") ) { - wxLogError("Cannot initialize the help system, aborting."); + wxLogError(wxT("Cannot initialize the help system, aborting.")); return FALSE; } +#if wxUSE_MS_HTML_HELP + if( !frame->GetMSHtmlHelpController().Initialize("doc") ) + { + wxLogError(wxT("Cannot initialize the MS HTML Help system.")); + } +#endif + +#if wxUSE_MS_HTML_HELP && wxUSE_WXHTML_HELP + // you need to call Initialize in order to use wxBestHelpController + if( !frame->GetBestHelpController().Initialize("doc") ) + { + wxLogError(wxT("Cannot initialize the best help system, aborting.")); + } +#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("Cannot initialize the HTML help system, aborting."); + wxLogError(wxT("Cannot initialize the HTML help system, aborting.")); return FALSE; } @@ -313,13 +348,14 @@ bool MyApp::OnInit() // (zipped) form if ( !frame->GetAdvancedHtmlHelpController().Initialize("doc") ) { - wxLogError("Cannot initialize the advanced HTML help system, aborting."); + wxLogError(wxT("Cannot initialize the advanced HTML help system, aborting.")); return FALSE; } #endif -#if defined(__WXMSW__) && wxUSE_MS_HTML_HELP +#if 0 + // defined(__WXMSW__) && wxUSE_MS_HTML_HELP wxString path(wxGetCwd()); if ( !frame->GetMSHtmlHelpController().Initialize(path + "\\doc.chm") ) { @@ -387,6 +423,11 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) menuFile->Append(HelpDemo_MS_Html_Help_Search, "MS HTML &Search help..."); #endif +#if wxUSE_MS_HTML_HELP && wxUSE_WXHTML_HELP + menuFile->AppendSeparator(); + menuFile->Append(HelpDemo_Best_Help_Index, "Best &Help Index..."); +#endif + #ifndef __WXMSW__ #if !wxUSE_HTML menuFile->AppendSeparator(); @@ -470,6 +511,13 @@ void MyFrame::OnMSHtmlHelp(wxCommandEvent& event) #endif } +void MyFrame::OnBestHelp(wxCommandEvent& event) +{ +#if wxUSE_MS_HTML_HELP && wxUSE_WXHTML_HELP + ShowHelp(event.GetId(), m_bestHelp); +#endif +} + /* Notes: ShowHelp uses section ids for displaying particular topics, but you might want to use a unique keyword to display a topic, instead. @@ -545,6 +593,7 @@ void MyFrame::ShowHelp(int commandId, wxHelpControllerBase& helpController) 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 @@ -560,6 +609,7 @@ void MyFrame::ShowHelp(int commandId, wxHelpControllerBase& helpController) 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; @@ -568,6 +618,7 @@ void MyFrame::ShowHelp(int commandId, wxHelpControllerBase& helpController) 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", @@ -582,6 +633,7 @@ void MyFrame::ShowHelp(int commandId, wxHelpControllerBase& helpController) 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; @@ -639,8 +691,7 @@ MyModalDialog::MyModalDialog(wxWindow *parent) wxTextCtrl *text = new wxTextCtrl(this, -1, wxT("A demo text control"), wxDefaultPosition, wxSize(300, 100), wxTE_MULTILINE); - text->SetHelpText(_("Type text here if you have got nothing more " - "interesting to do")); + text->SetHelpText(_("Type text here if you have got nothing more interesting to do")); sizerTop->Add(text, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); sizerTop->Add(sizerRow, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5 );