Unicode compilation fixes

[wxWidgets.git] / src / generic / helphtml.cpp

diff --git a/src/generic/helphtml.cpp b/src/generic/helphtml.cpp
index 3c546e1bd2cc79c727c40d127d49fb0cf981042b..1f3f59250fb1044c8e903367600b2f9425a8ba85 100644 (file)
--- a/src/generic/helphtml.cpp
+++ b/src/generic/helphtml.cpp
@@ -19,12 +19,16 @@
     #pragma hdrstop
 #endif
 
     #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"
 #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"
 #endif
 
 #include "wx/helpbase.h"


@@ -32,12 +36,16 @@
 
 #include <stdio.h>
 #include <ctype.h>
 
 #include <stdio.h>
 #include <ctype.h>

+#ifndef __MWERKS__

 #include <sys/stat.h>
 #include <sys/stat.h>

+#endif

 
 

-#ifndef __WINDOWS__
+#if !defined(__WINDOWS__) && !defined(__OS2__)

     #include   <unistd.h>
 #endif
 
     #include   <unistd.h>
 #endif
 

+#define CONTENTS_ID   0
+

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


@@ -135,7 +143,7 @@ wxHTMLHelpControllerBase::LoadFile(const wxString& ifile)
          {
             newfile = WXEXTHELP_SEPARATOR;
             const wxChar *cptr = wxGetLocale()->GetName().c_str();
          {
             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;
                newfile << *(cptr++);
             if(wxDirExists(newfile))
                file = newfile;


@@ -158,7 +166,7 @@ wxHTMLHelpControllerBase::LoadFile(const wxString& ifile)
    m_MapList = new wxList;
    m_NumOfEntries = 0;
 
    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
    if(! input)
       return FALSE;
    do


@@ -197,8 +205,31 @@ wxHTMLHelpControllerBase::DisplayContents()
 {
    if(! m_NumOfEntries)
       return FALSE;
 {
    if(! m_NumOfEntries)
       return FALSE;

-   wxBusyCursor b; // display a busy cursor
-   return KeywordSearch("");
+
+   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
 }
 
 bool


@@ -220,6 +251,16 @@ wxHTMLHelpControllerBase::DisplaySection(int sectionNo)
    return FALSE;
 }
 
    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)
 {
 bool
 wxHTMLHelpControllerBase::DisplayBlock(long blockNo)
 {


@@ -232,7 +273,6 @@ wxHTMLHelpControllerBase::KeywordSearch(const wxString& k)
    if(! m_NumOfEntries)
       return FALSE;
 
    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;
    wxString     *choices = new wxString[m_NumOfEntries];
    wxString     *urls = new wxString[m_NumOfEntries];
    wxString compA, compB;


@@ -243,25 +283,28 @@ wxHTMLHelpControllerBase::KeywordSearch(const wxString& k)
    wxNode       *node = m_MapList->First();
    wxExtHelpMapEntry *entry;
 
    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)
    }
 
    if(idx == 1)


@@ -299,3 +342,4 @@ wxHTMLHelpControllerBase::OnQuit()
 {
 }
 
 {
 }
 

+#endif // wxUSE_HELP