X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/585ae8cbc0ba875d2b0e836d5db429e702f0c289..7052b16dedae79bec878ce41e4607a39a969610c:/src/generic/helphtml.cpp

diff --git a/src/generic/helphtml.cpp b/src/generic/helphtml.cpp
index e342567285..8378a1496f 100644
--- a/src/generic/helphtml.cpp
+++ b/src/generic/helphtml.cpp
@@ -40,10 +40,21 @@
 #include <sys/stat.h>
 #endif
 
-#ifndef __WINDOWS__
+#if !defined(__WINDOWS__) && !defined(__OS2__)
     #include   <unistd.h>
 #endif
 
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+/// Name for map file.
+#define WXEXTHELP_MAPFILE   _T("wxhelp.map")
+/// Maximum line length in map file.
+#define WXEXTHELP_BUFLEN 512
+/// Character introducing comments/documentation field in map file.
+#define WXEXTHELP_COMMENTCHAR   ';'
+
 #define CONTENTS_ID   0
 
 class wxExtHelpMapEntry : public wxObject
@@ -75,12 +86,12 @@ wxHTMLHelpControllerBase::DeleteList()
 {
    if(m_MapList)
    {
-      wxNode *node = m_MapList->First();
+      wxNode *node = m_MapList->GetFirst();
       while (node)
       {
-         delete (wxExtHelpMapEntry *)node->Data();
+         delete (wxExtHelpMapEntry *)node->GetData();
          delete node;
-         node = m_MapList->First();
+         node = m_MapList->GetFirst();
       }
       delete m_MapList;
       m_MapList = (wxList*) NULL;
@@ -122,7 +133,11 @@ wxHTMLHelpControllerBase::LoadFile(const wxString& ifile)
          wxChar* f = wxGetWorkingDirectory();
          file = f;
          delete[] f; // wxGetWorkingDirectory returns new memory
+#ifdef __WXMAC__
+         file << ifile;
+#else
          file << WXEXTHELP_SEPARATOR << ifile;
+#endif
       }
       else
          file = ifile;
@@ -143,7 +158,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;
@@ -166,7 +181,7 @@ wxHTMLHelpControllerBase::LoadFile(const wxString& ifile)
    m_MapList = new wxList;
    m_NumOfEntries = 0;
 
-   FILE *input = fopen(mapFile.fn_str(),"rt");
+   FILE *input = wxFopen(mapFile,wxT("rt"));
    if(! input)
       return FALSE;
    do
@@ -180,15 +195,15 @@ wxHTMLHelpControllerBase::LoadFile(const wxString& ifile)
             break; // error
          for(i=0; isdigit(buffer[i])||isspace(buffer[i])||buffer[i]=='-'; i++)
             ; // find begin of URL
-         url = "";
+         url = wxT("");
          while(buffer[i] && ! isspace(buffer[i]) && buffer[i] !=
                WXEXTHELP_COMMENTCHAR)
-            url << buffer[i++];
+            url << (wxChar) buffer[i++];
          while(buffer[i] && buffer[i] != WXEXTHELP_COMMENTCHAR)
             i++;
-         doc = "";
+         doc = wxT("");
          if(buffer[i])
-            doc = (buffer + i + 1); // skip the comment character
+            doc = wxString::FromAscii( (buffer + i + 1) ); // skip the comment character
          m_MapList->Append(new wxExtHelpMapEntry(id,url,doc));
          m_NumOfEntries++;
       }
@@ -207,29 +222,29 @@ wxHTMLHelpControllerBase::DisplayContents()
       return FALSE;
 
    wxString contents;
-   wxNode *node = m_MapList->First();
+   wxNode *node = m_MapList->GetFirst();
    wxExtHelpMapEntry *entry;
    while(node)
    {
-      entry = (wxExtHelpMapEntry *)node->Data();
+      entry = (wxExtHelpMapEntry *)node->GetData();
       if(entry->id == CONTENTS_ID)
       {
          contents = entry->url;
          break;
       }
-      node = node->Next();
+      node = node->GetNext();
    }
 
    bool rc = FALSE;
    wxString file;
    file << m_MapFile << WXEXTHELP_SEPARATOR << contents;
-   if(file.Contains(_T('#')))
-      file = file.BeforeLast(_T('#'));
+   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(_T(""));
+   return rc ? TRUE : KeywordSearch(wxT(""));
 }
 
 bool
@@ -239,18 +254,28 @@ wxHTMLHelpControllerBase::DisplaySection(int sectionNo)
       return FALSE;
 
    wxBusyCursor b; // display a busy cursor
-   wxNode *node = m_MapList->First();
+   wxNode *node = m_MapList->GetFirst();
    wxExtHelpMapEntry *entry;
    while(node)
    {
-      entry = (wxExtHelpMapEntry *)node->Data();
+      entry = (wxExtHelpMapEntry *)node->GetData();
       if(entry->id == sectionNo)
          return DisplayHelp(entry->url);
-      node = node->Next();
+      node = node->GetNext();
    }
    return FALSE;
 }
 
+bool wxHTMLHelpControllerBase::DisplaySection(const wxString& section)
+{
+    bool isFilename = (section.Find(wxT(".htm")) != -1);
+
+    if (isFilename)
+        return DisplayHelp(section);
+    else
+        return KeywordSearch(section);
+}
+
 bool
 wxHTMLHelpControllerBase::DisplayBlock(long blockNo)
 {
@@ -270,7 +295,7 @@ wxHTMLHelpControllerBase::KeywordSearch(const wxString& k)
    int          idx = 0, j;
    bool         rc;
    bool         showAll = k.IsEmpty();
-   wxNode       *node = m_MapList->First();
+   wxNode       *node = m_MapList->GetFirst();
    wxExtHelpMapEntry *entry;
 
    {
@@ -278,7 +303,7 @@ wxHTMLHelpControllerBase::KeywordSearch(const wxString& k)
       compA = k; compA.LowerCase(); // we compare case insensitive
       while(node)
       {
-         entry = (wxExtHelpMapEntry *)node->Data();
+         entry = (wxExtHelpMapEntry *)node->GetData();
          compB = entry->doc; compB.LowerCase();
          if((showAll || compB.Contains(k)) && ! compB.IsEmpty())
          {
@@ -287,16 +312,16 @@ wxHTMLHelpControllerBase::KeywordSearch(const wxString& k)
             // choices[idx] = (**i).doc.Contains((**i).doc.Before(WXEXTHELP_COMMENTCHAR));
             //if(choices[idx].IsEmpty()) // didn't contain the ';'
             //   choices[idx] = (**i).doc;
-            choices[idx] = "";
+            choices[idx] = wxT("");
             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->GetNext();
       }
    }
-   
+
    if(idx == 1)
       rc = DisplayHelp(urls[0]);
    else if(idx == 0)