Suppressed a spurious error message, now contents are looked for in entry

with help-id 0 and if not found a homemade list of contents is presented. :-)

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

diff --git a/src/generic/helphtml.cpp b/src/generic/helphtml.cpp
index cabeb9a82543d98ba224e0350712f6c2539cd7a7..06a69ad4b0d715044f60c77c66c0ac7d751631cd 100644 (file)
--- a/src/generic/helphtml.cpp
+++ b/src/generic/helphtml.cpp
@@ -38,6 +38,8 @@
     #include   <unistd.h>
 #endif
 
     #include   <unistd.h>
 #endif
 

+#define CONTENTS_ID   0
+

 class wxExtHelpMapEntry : public wxObject
 {
 public:
 class wxExtHelpMapEntry : public wxObject
 {
 public:


@@ -198,11 +200,26 @@ wxHTMLHelpControllerBase::DisplayContents()
    if(! m_NumOfEntries)
       return FALSE;
 
    if(! m_NumOfEntries)
       return FALSE;
 

-   // use ID 0 for contents
-   if(! DisplaySection(0))
-      return KeywordSearch("");
-   else
-      return TRUE;
+   wxString contents;
+   wxNode *node = m_MapList->First();
+   wxExtHelpMapEntry *entry;
+   while(node)
+   {
+      entry = (wxExtHelpMapEntry *)node->Data();
+      if(entry->id == CONTENTS_ID)
+      {
+         contents = entry->url;
+         break;
+      }
+      node = node->Next();
+   }
+
+   bool rc = FALSE;
+   if(contents.Length() && wxFileExists(contents.BeforeLast('#')))
+      rc = DisplaySection(CONTENTS_ID);
+   
+   // if not found, open homemade toc:
+   return rc ? TRUE : KeywordSearch("");

 }
 
 bool
 }
 
 bool