Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed helpwxht.h/cpp (old wxHelpControllerHtml class)

Browse Source 
and updated makefiles accordingly


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14734 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-03-22 22:29:20 +00:00
parent 11611a6211
commit e564aa153e
21 changed files with 25 additions and 507 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
samples/help/demo.cpp
View File

@@ -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
@@ -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