Added USE_SIMPLE_HELP_PROVIDER symbol to help demo so we can test

wxSimpleHelpProvider under Windows.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15772 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/help/demo.cpp b/samples/help/demo.cpp
index 7e8334038d13d6f65c0b57a2ae1cb350fb465efa..a038747f0d9320da96b2db13b76f846b0998daa7 100644 (file)
--- a/samples/help/demo.cpp
+++ b/samples/help/demo.cpp
@@ -44,6 +44,11 @@
 
 #define USE_HTML_HELP 1
 
 
 #define USE_HTML_HELP 1
 

+// 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
 #define USE_HTML_HELP 0
 #if !wxUSE_HTML
 #undef USE_HTML_HELP
 #define USE_HTML_HELP 0


@@ -257,8 +262,11 @@ bool MyApp::OnInit()
 {
     // Create a simple help provider to make SetHelpText() do something.
     // Note that this must be set before any SetHelpText() calls are made.
 {
     // 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;
     wxHelpControllerHelpProvider* provider = new wxHelpControllerHelpProvider;

+#endif

     wxHelpProvider::Set(provider);
 
 #if wxUSE_HTML
     wxHelpProvider::Set(provider);
 
 #if wxUSE_HTML


@@ -278,10 +286,12 @@ bool MyApp::OnInit()
     MyFrame *frame = new MyFrame("HelpDemo wxWindows App",
                                  wxPoint(50, 50), wxSize(450, 340));
 
     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());
 #if wxUSE_MS_HTML_HELP
     provider->SetHelpController(& frame->GetMSHtmlHelpController());
 #else
     provider->SetHelpController(& frame->GetHelpController());

+#endif

 #endif
 
     frame->Show(TRUE);
 #endif
 
     frame->Show(TRUE);