#define USE_HTML_HELP 1
-// Use old-style HTML help if 1
-#define USE_OLD_HTML_HELP 0
+// Define this to 0 to use the help controller as the help
+// provider, or to 1 to use the 'simple help provider'
+// (the one implemented with wxTipWindow).
+#define USE_SIMPLE_HELP_PROVIDER 0
#if !wxUSE_HTML
#undef USE_HTML_HELP
#endif
#if USE_HTML_HELP
-#include <wx/filesys.h>
-#include <wx/fs_zip.h>
-
-#if USE_OLD_HTML_HELP
-#include "wx/generic/helpwxht.h"
-#endif
+#include "wx/filesys.h"
+#include "wx/fs_zip.h"
#include "wx/html/helpctrl.h"
#endif
// 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
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
// 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);
wxHelpController m_help;
#if USE_HTML_HELP
-#if USE_OLD_HTML_HELP
- wxHelpControllerHtml m_htmlHelp;
-#endif
wxHtmlHelpController m_advancedHtmlHelp;
#endif
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)
{
// Create a simple help provider to make SetHelpText() do something.
// Note that this must be set before any SetHelpText() calls are made.
- //wxHelpProvider::Set(new wxSimpleHelpProvider);
+#if USE_SIMPLE_HELP_PROVIDER
+ wxSimpleHelpProvider* provider = new wxSimpleHelpProvider;
+#else
wxHelpControllerHelpProvider* provider = new wxHelpControllerHelpProvider;
+#endif
wxHelpProvider::Set(provider);
#if wxUSE_HTML
MyFrame *frame = new MyFrame("HelpDemo wxWindows App",
wxPoint(50, 50), wxSize(450, 340));
+#if !USE_SIMPLE_HELP_PROVIDER
#if wxUSE_MS_HTML_HELP
provider->SetHelpController(& frame->GetMSHtmlHelpController());
#else
provider->SetHelpController(& frame->GetHelpController());
+#endif
#endif
frame->Show(TRUE);
#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") )
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...");
// a panel first - if there were several controls, it would allow us to
// navigate between them from the keyboard
wxPanel *panel = new wxPanel(this, 301, wxPoint(0, 0), wxSize(400, 200));
- //panel->SetHelpText(_("This panel just holds a static text control."));
- panel->SetHelpText(wxContextId(300));
+ panel->SetHelpText(_("This panel just holds a static text control."));
+ //panel->SetHelpText(wxContextId(300));
// and a static control whose parent is the panel
wxStaticText* staticText = new wxStaticText(panel, 302, "Hello, world!", wxPoint(10, 10));
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
{
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;
}
}
projects / wxWidgets.git / blobdiff