From a1b8f5489d86db1051d3640101da12456eaa099c Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Tue, 12 Sep 2000 15:47:20 +0000 Subject: [PATCH] Minor mods git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8341 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/help/{popups.txt => cshelp.txt} | 0 samples/help/demo.cpp | 5 +++-- samples/help/doc.chm | Bin 8922 -> 13506 bytes samples/help/doc.hhp | 2 +- src/msw/helpchm.cpp | 5 +++-- 5 files changed, 7 insertions(+), 5 deletions(-) rename samples/help/{popups.txt => cshelp.txt} (100%) diff --git a/samples/help/popups.txt b/samples/help/cshelp.txt similarity index 100% rename from samples/help/popups.txt rename to samples/help/cshelp.txt diff --git a/samples/help/demo.cpp b/samples/help/demo.cpp index d1bc2f6f7a..daba593c1a 100644 --- a/samples/help/demo.cpp +++ b/samples/help/demo.cpp @@ -319,8 +319,9 @@ bool MyApp::OnInit() } #endif -#if wxUSE_MS_HTML_HELP - if ( !frame->GetMSHtmlHelpController().Initialize("doc") ) +#if defined(__WXMSW__) && wxUSE_MS_HTML_HELP + wxString path(wxGetCwd()); + if ( !frame->GetMSHtmlHelpController().Initialize(path + "\\doc.chm") ) { wxLogError("Cannot initialize the MS HTML help system, aborting."); diff --git a/samples/help/doc.chm b/samples/help/doc.chm index 6a197291c668db56c8cf61382c462ee1a29a3408..9a328d8584a0289939d048e5435d7969b05a1302 100644 GIT binary patch delta 5187 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