Minor mods

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8341 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2000-09-12 15:47:20 +00:00
parent 83141d3a74
commit a1b8f5489d
5 changed files with 7 additions and 5 deletions

View File

@@ -319,8 +319,9 @@ bool MyApp::OnInit()
} }
#endif #endif
#if wxUSE_MS_HTML_HELP #if defined(__WXMSW__) && wxUSE_MS_HTML_HELP
if ( !frame->GetMSHtmlHelpController().Initialize("doc") ) wxString path(wxGetCwd());
if ( !frame->GetMSHtmlHelpController().Initialize(path + "\\doc.chm") )
{ {
wxLogError("Cannot initialize the MS HTML help system, aborting."); wxLogError("Cannot initialize the MS HTML help system, aborting.");

Binary file not shown.

View File

@@ -27,7 +27,7 @@ doc5.htm
[TEXT POPUPS] [TEXT POPUPS]
doc.h doc.h
popups.txt cshelp.txt
[INFOTYPES] [INFOTYPES]

View File

@@ -108,8 +108,9 @@ bool wxCHMHelpController::DisplayContextPopup(int contextId)
wxString str = GetValidFilename(m_helpFile); wxString str = GetValidFilename(m_helpFile);
// TODO: what should this be? // We also have to specify the popups file (default is cshelp.txt).
//HtmlHelp(GetSuitableHWND(), (const wxChar*) str, HH_HELP_CONTEXT, (DWORD)contextId); // str += wxT("::/cshelp.txt");
HH_POPUP popup; HH_POPUP popup;
popup.cbStruct = sizeof(popup); popup.cbStruct = sizeof(popup);
popup.hinst = (HINSTANCE) wxGetInstance(); popup.hinst = (HINSTANCE) wxGetInstance();