From: Karsten Ballüder <ballueder@usa.net>
Date: Sat, 24 Jul 1999 22:38:00 +0000 (+0000)
Subject: minor fix to find contents file alright
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/3bcf00abd7aa6b515e776e18b3e295467a693959

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 190574aade..3e0a648dee 100644
--- 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: