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 (file)
index 0000000..0c6d69a
--- /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 d1bc2f6f7ab345977fbf522861381f7d9c205141..daba593c1aee151679e3dfa7cb2a882f3b310ff7 100644 (file)
--- a/samples/help/demo.cpp
+++ b/samples/help/demo.cpp
@@ -319,8 +319,9 @@ bool MyApp::OnInit()
     }
 #endif
 
     }
 #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.");
 
     {
         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 (file)
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 b0098fc48c2cf2d81534c063ca5bbbc0eb5b8c23..6431ba701dba153736daa9473f7b2b48ed62dbcf 100644 (file)
--- a/samples/help/doc.hhp
+++ b/samples/help/doc.hhp
@@ -27,7 +27,7 @@ doc5.htm
 
 [TEXT POPUPS]
 doc.h
 
 [TEXT POPUPS]
 doc.h

-popups.txt
+cshelp.txt

 
 [INFOTYPES]
 
 
 [INFOTYPES]
 

diff --git a/samples/help/popups.txt b/samples/help/popups.txt
deleted file mode 100644 (file)
index 0c6d69a..0000000
--- 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 71356d4f6ffe23501a2718b139305b36ddc43f31..d163c2f196e7e9046fd2f5bf48a838f47f93bb2a 100644 (file)
--- a/src/msw/helpchm.cpp
+++ b/src/msw/helpchm.cpp
@@ -108,8 +108,9 @@ bool wxCHMHelpController::DisplayContextPopup(int contextId)
 
     wxString str = GetValidFilename(m_helpFile);
 
 
     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();
     HH_POPUP popup;
     popup.cbStruct = sizeof(popup);
     popup.hinst = (HINSTANCE) wxGetInstance();