minor fix to find contents file alright

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

diff --git a/src/generic/helphtml.cpp b/src/generic/helphtml.cpp
index 190574aadea11cead44dec90cc3a108f043ee3ca..3e0a648dee358f6be362cb92d7fd673c3dec8e58 100644 (file)
--- a/src/generic/helphtml.cpp
+++ b/src/generic/helphtml.cpp
@@ -217,7 +217,11 @@ wxHTMLHelpControllerBase::DisplayContents()
    }
 
    bool rc = FALSE;
-   if(contents.Length() && wxFileExists(contents.BeforeLast('#')))
+   wxString file;
+   file << m_MapFile << WXEXTHELP_SEPARATOR << contents;
+   if(file.Contains('#'))
+      file = file.BeforeLast('#');
+   if(contents.Length() && wxFileExists(file))
       rc = DisplaySection(CONTENTS_ID);
    
    // if not found, open homemade toc: