X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8dd71e2b5181ea24c88cbdc5a921187260b045ae..fed628b632d8ae95efded1f6a6894573c7a76bef:/src/generic/helphtml.cpp?ds=sidebyside

diff --git a/src/generic/helphtml.cpp b/src/generic/helphtml.cpp
index cabeb9a825..f8731d8d17 100644
--- a/src/generic/helphtml.cpp
+++ b/src/generic/helphtml.cpp
@@ -19,12 +19,16 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_HELP
+
 #ifndef WX_PRECOMP
     #include "wx/setup.h"
     #include "wx/string.h"
     #include "wx/utils.h"
     #include "wx/list.h"
     #include "wx/intl.h"
+    #include "wx/msgdlg.h"
+    #include "wx/choicdlg.h"
 #endif
 
 #include "wx/helpbase.h"
@@ -32,12 +36,16 @@
 
 #include <stdio.h>
 #include <ctype.h>
+#ifndef __MWERKS__
 #include <sys/stat.h>
+#endif
 
-#ifndef __WINDOWS__
+#if !defined(__WINDOWS__) && !defined(__OS2__)
     #include   <unistd.h>
 #endif
 
+#define CONTENTS_ID   0
+
 class wxExtHelpMapEntry : public wxObject
 {
 public:
@@ -135,7 +143,7 @@ wxHTMLHelpControllerBase::LoadFile(const wxString& ifile)
          {
             newfile = WXEXTHELP_SEPARATOR;
             const wxChar *cptr = wxGetLocale()->GetName().c_str();
-            while(*cptr && *cptr != _T('_'))
+            while(*cptr && *cptr != wxT('_'))
                newfile << *(cptr++);
             if(wxDirExists(newfile))
                file = newfile;
@@ -198,11 +206,30 @@ wxHTMLHelpControllerBase::DisplayContents()
    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;
+   wxString file;
+   file << m_MapFile << WXEXTHELP_SEPARATOR << contents;
+   if(file.Contains(wxT('#')))
+      file = file.BeforeLast(wxT('#'));
+   if(contents.Length() && wxFileExists(file))
+      rc = DisplaySection(CONTENTS_ID);
+
+   // if not found, open homemade toc:
+   return rc ? TRUE : KeywordSearch(wxT(""));
 }
 
 bool
@@ -236,7 +263,6 @@ wxHTMLHelpControllerBase::KeywordSearch(const wxString& k)
    if(! m_NumOfEntries)
       return FALSE;
 
-   wxBusyCursor b; // display a busy cursor
    wxString     *choices = new wxString[m_NumOfEntries];
    wxString     *urls = new wxString[m_NumOfEntries];
    wxString compA, compB;
@@ -247,25 +273,28 @@ wxHTMLHelpControllerBase::KeywordSearch(const wxString& k)
    wxNode       *node = m_MapList->First();
    wxExtHelpMapEntry *entry;
 
-   compA = k; compA.LowerCase(); // we compare case insensitive
-   while(node)
    {
-      entry = (wxExtHelpMapEntry *)node->Data();
-      compB = entry->doc; compB.LowerCase();
-      if((showAll || compB.Contains(k)) && ! compB.IsEmpty())
+      wxBusyCursor b; // display a busy cursor
+      compA = k; compA.LowerCase(); // we compare case insensitive
+      while(node)
       {
-         urls[idx] = entry->url;
-         // doesn't work:
-         // choices[idx] = (**i).doc.Contains((**i).doc.Before(WXEXTHELP_COMMENTCHAR));
-         //if(choices[idx].IsEmpty()) // didn't contain the ';'
-         //   choices[idx] = (**i).doc;
-         choices[idx] = "";
-         for(j=0;entry->doc.c_str()[j]
-                && entry->doc.c_str()[j] != WXEXTHELP_COMMENTCHAR; j++)
-            choices[idx] << entry->doc.c_str()[j];
-         idx++;
+         entry = (wxExtHelpMapEntry *)node->Data();
+         compB = entry->doc; compB.LowerCase();
+         if((showAll || compB.Contains(k)) && ! compB.IsEmpty())
+         {
+            urls[idx] = entry->url;
+            // doesn't work:
+            // choices[idx] = (**i).doc.Contains((**i).doc.Before(WXEXTHELP_COMMENTCHAR));
+            //if(choices[idx].IsEmpty()) // didn't contain the ';'
+            //   choices[idx] = (**i).doc;
+            choices[idx] = "";
+            for(j=0;entry->doc.c_str()[j]
+                   && entry->doc.c_str()[j] != WXEXTHELP_COMMENTCHAR; j++)
+               choices[idx] << entry->doc.c_str()[j];
+            idx++;
+         }
+         node = node->Next();
       }
-      node = node->Next();
    }
 
    if(idx == 1)
@@ -303,3 +332,4 @@ wxHTMLHelpControllerBase::OnQuit()
 {
 }
 
+#endif // wxUSE_HELP