From: Julian Smart <julian@anthemion.co.uk>
Date: Tue, 12 Sep 2000 15:47:20 +0000 (+0000)
Subject: Minor mods
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/a1b8f5489d86db1051d3640101da12456eaa099c

Minor mods


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

diff --git a/samples/help/cshelp.txt b/samples/help/cshelp.txt
new file mode 100644
index 0000000000..0c6d69a6da
--- /dev/null
+++ b/samples/help/cshelp.txt
@@ -0,0 +1,9 @@
+.topic IDH_PANEL
+This is the topic for the main panel.
+
+.topic IDH_TEXT
+This is the topic for the text control.
+
+.topic IDH_OK
+This is the topic for the OK button.
+
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 6a197291c6..9a328d8584 100644
Binary files a/samples/help/doc.chm and b/samples/help/doc.chm differ
diff --git a/samples/help/doc.hhp b/samples/help/doc.hhp
index b0098fc48c..6431ba701d 100644
--- a/samples/help/doc.hhp
+++ b/samples/help/doc.hhp
@@ -27,7 +27,7 @@ doc5.htm
 
 [TEXT POPUPS]
 doc.h
-popups.txt
+cshelp.txt
 
 [INFOTYPES]
 
diff --git a/samples/help/popups.txt b/samples/help/popups.txt
deleted file mode 100644
index 0c6d69a6da..0000000000
--- a/samples/help/popups.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-.topic IDH_PANEL
-This is the topic for the main panel.
-
-.topic IDH_TEXT
-This is the topic for the text control.
-
-.topic IDH_OK
-This is the topic for the OK button.
-
diff --git a/src/msw/helpchm.cpp b/src/msw/helpchm.cpp
index 71356d4f6f..d163c2f196 100644
--- a/src/msw/helpchm.cpp
+++ b/src/msw/helpchm.cpp
@@ -108,8 +108,9 @@ bool wxCHMHelpController::DisplayContextPopup(int contextId)
 
     wxString str = GetValidFilename(m_helpFile);
 
-    // TODO: what should this be?
-    //HtmlHelp(GetSuitableHWND(), (const wxChar*) str, HH_HELP_CONTEXT, (DWORD)contextId);
+    // We also have to specify the popups file (default is cshelp.txt).
+    // str += wxT("::/cshelp.txt");
+
     HH_POPUP popup;
     popup.cbStruct = sizeof(popup);
     popup.hinst = (HINSTANCE) wxGetInstance();