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

added an option to use wxExtHelpController (which means that it now depends on the adv library)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38391 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-03-27 17:32:02 +00:00
parent 249b3fe3bb
commit 02f51f1f14
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
samples/help/demo.cpp
View File

@@ -41,9 +41,11 @@
// define this to 1 to use HTML help even under Windows (by default, Windows // define this to 1 to use HTML help even under Windows (by default, Windows
// version will use WinHelp). // version will use WinHelp).
// Please also see samples/html/helpview. // Please also see samples/html/helpview.
#define USE_HTML_HELP 1 #define USE_HTML_HELP 1
// define this to 1 to use external help controller (not used by default)
#define USE_EXT_HELP 0
// Define this to 0 to use the help controller as the help // Define this to 0 to use the help controller as the help
// provider, or to 1 to use the 'simple help provider' // provider, or to 1 to use the 'simple help provider'
// (the one implemented with wxTipWindow). // (the one implemented with wxTipWindow).
@@ -69,6 +71,10 @@
#include "wx/msw/helpbest.h" #include "wx/msw/helpbest.h"
#endif #endif
#if USE_EXT_HELP
#include "wx/generic/helpext.h"
#endif
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// ressources // ressources
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -104,7 +110,7 @@ public:
// ctor(s) // ctor(s)
MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size); MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size);
wxHelpController& GetHelpController() { return m_help; } wxHelpControllerBase& GetHelpController() { return m_help; }
#if USE_HTML_HELP #if USE_HTML_HELP
wxHtmlHelpController& GetAdvancedHtmlHelpController() { return m_advancedHtmlHelp; } wxHtmlHelpController& GetAdvancedHtmlHelpController() { return m_advancedHtmlHelp; }
@@ -136,7 +142,11 @@ public:
void ShowHelp(int commandId, wxHelpControllerBase& helpController); void ShowHelp(int commandId, wxHelpControllerBase& helpController);
private: private:
#if USE_EXT_HELP
wxExtHelpController m_help;
#else
wxHelpController m_help; wxHelpController m_help;
#endif
#if USE_HTML_HELP #if USE_HTML_HELP
wxHtmlHelpController m_advancedHtmlHelp; wxHtmlHelpController m_advancedHtmlHelp;
@@ -286,7 +296,7 @@ bool MyApp::OnInit()
#endif #endif
wxHelpProvider::Set(provider); wxHelpProvider::Set(provider);
#if wxUSE_HTML #if USE_HTML_HELP
#if wxUSE_GIF #if wxUSE_GIF
// Required for images in the online documentation // Required for images in the online documentation
wxImage::AddHandler(new wxGIFHandler); wxImage::AddHandler(new wxGIFHandler);

1
samples/help/help.bkl
View File

@@ -6,6 +6,7 @@
<exe id="help" template="wx_sample" template_append="wx_append"> <exe id="help" template="wx_sample" template_append="wx_append">
<sources>demo.cpp</sources> <sources>demo.cpp</sources>
<wx-lib>html</wx-lib> <wx-lib>html</wx-lib>
<wx-lib>adv</wx-lib>
<wx-lib>core</wx-lib> <wx-lib>core</wx-lib>
<wx-lib>base</wx-lib> <wx-lib>base</wx-lib>
<win32-res>demo.rc</win32-res> <win32-res>demo.rc</win32-res>