From 02f51f1f140e181d97eb38c83b9f272292e743d0 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 27 Mar 2006 17:32:02 +0000
Subject: [PATCH] added an option to use wxExtHelpController (which means that
 it now depends on the adv library)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38391 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 samples/help/demo.cpp | 16 +++++++++++++---
 samples/help/help.bkl |  1 +
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/samples/help/demo.cpp b/samples/help/demo.cpp
index e36ac139d9..fab737dec3 100644
--- a/samples/help/demo.cpp
+++ b/samples/help/demo.cpp
@@ -41,9 +41,11 @@
 // define this to 1 to use HTML help even under Windows (by default, Windows
 // version will use WinHelp).
 // Please also see samples/html/helpview.
-
 #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
 // provider, or to 1 to use the 'simple help provider'
 // (the one implemented with wxTipWindow).
@@ -69,6 +71,10 @@
 #include "wx/msw/helpbest.h"
 #endif
 
+#if USE_EXT_HELP
+#include "wx/generic/helpext.h"
+#endif
+
 // ----------------------------------------------------------------------------
 // ressources
 // ----------------------------------------------------------------------------
@@ -104,7 +110,7 @@ public:
     // ctor(s)
     MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size);
 
-    wxHelpController& GetHelpController() { return m_help; }
+    wxHelpControllerBase& GetHelpController() { return m_help; }
 
 #if USE_HTML_HELP
     wxHtmlHelpController& GetAdvancedHtmlHelpController() { return m_advancedHtmlHelp; }
@@ -136,7 +142,11 @@ public:
     void ShowHelp(int commandId, wxHelpControllerBase& helpController);
 
 private:
+#if USE_EXT_HELP
+   wxExtHelpController      m_help;
+#else
    wxHelpController         m_help;
+#endif
 
 #if USE_HTML_HELP
    wxHtmlHelpController     m_advancedHtmlHelp;
@@ -286,7 +296,7 @@ bool MyApp::OnInit()
 #endif
     wxHelpProvider::Set(provider);
 
-#if wxUSE_HTML
+#if USE_HTML_HELP
     #if wxUSE_GIF
         // Required for images in the online documentation
         wxImage::AddHandler(new wxGIFHandler);
diff --git a/samples/help/help.bkl b/samples/help/help.bkl
index ec4a6fc414..373d3de412 100644
--- a/samples/help/help.bkl
+++ b/samples/help/help.bkl
@@ -6,6 +6,7 @@
     <exe id="help" template="wx_sample" template_append="wx_append">
         <sources>demo.cpp</sources>
         <wx-lib>html</wx-lib>
+        <wx-lib>adv</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <win32-res>demo.rc</win32-res>
-- 
2.47.2