corrected test for __WXGTK__ (but should it be there at all?)

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

diff --git a/src/generic/helpext.cpp b/src/generic/helpext.cpp
index e0e5ef301156674578791c8df91937f41420c771..49dae623f0f0c7e4d0c752f1dc7ffad14fa89b2e 100644 (file)
--- a/src/generic/helpext.cpp
+++ b/src/generic/helpext.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#if wxUSE_HELP && !defined(__WXWINCE__)
+#if wxUSE_HELP && !defined(__WXWINCE__) && (!defined(__WXMAC__) || defined(__WXMAC_OSX__))

 
 #ifndef WX_PRECOMP
     #include "wx/setup.h"
 
 #ifndef WX_PRECOMP
     #include "wx/setup.h"


@@ -45,6 +45,7 @@
 
 #ifdef __WXMSW__
 #include <windows.h>
 
 #ifdef __WXMSW__
 #include <windows.h>

+#include "wx/msw/winundef.h"

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -137,7 +138,7 @@ wxExtHelpController::DisplayHelp(const wxString &relativeURL)
 //      return false;
 //   }
 //   else
 //      return false;
 //   }
 //   else

-      return TRUE;
+      return true;

 
 #elif defined(__DOS__)
 
 
 #elif defined(__DOS__)
 


@@ -173,7 +174,7 @@ wxExtHelpController::DisplayHelp(const wxString &relativeURL)
                  << WXEXTHELP_SEPARATOR << relativeURL << wxT(")");
          success = wxExecute(command);
          if(success != 0 ) // returns PID on success
                  << WXEXTHELP_SEPARATOR << relativeURL << wxT(")");
          success = wxExecute(command);
          if(success != 0 ) // returns PID on success

-            return TRUE;
+            return true;

       }
    }
 #endif
       }
    }
 #endif


@@ -231,7 +232,7 @@ bool wxExtHelpController::LoadFile(const wxString& ifile)
 
    wxBusyCursor b; // display a busy cursor
 
 
    wxBusyCursor b; // display a busy cursor
 

-   if(! ifile.IsEmpty())
+   if(! ifile.empty())

    {
       file = ifile;
       if(! wxIsAbsolutePath(file))
    {
       file = ifile;
       if(! wxIsAbsolutePath(file))


@@ -254,7 +255,7 @@ bool wxExtHelpController::LoadFile(const wxString& ifile)
       // set to be "de", then look in "/usr/local/myapp/help/de/"
       // first and fall back to "/usr/local/myapp/help" if that
       // doesn't exist.
       // set to be "de", then look in "/usr/local/myapp/help/de/"
       // first and fall back to "/usr/local/myapp/help" if that
       // doesn't exist.

-      if(wxGetLocale() && !wxGetLocale()->GetName().IsEmpty())
+      if(wxGetLocale() && !wxGetLocale()->GetName().empty())

       {
          wxString newfile;
          newfile << WXEXTHELP_SEPARATOR << wxGetLocale()->GetName();
       {
          wxString newfile;
          newfile << WXEXTHELP_SEPARATOR << wxGetLocale()->GetName();


@@ -273,7 +274,7 @@ bool wxExtHelpController::LoadFile(const wxString& ifile)
 #endif
 
       if(! wxDirExists(file))
 #endif
 
       if(! wxDirExists(file))

-         return FALSE;
+         return false;

 
       mapFile << file << WXEXTHELP_SEPARATOR << WXEXTHELP_MAPFILE;
    }
 
       mapFile << file << WXEXTHELP_SEPARATOR << WXEXTHELP_MAPFILE;
    }


@@ -281,7 +282,7 @@ bool wxExtHelpController::LoadFile(const wxString& ifile)
       mapFile = m_MapFile;
 
    if(! wxFileExists(mapFile))
       mapFile = m_MapFile;
 
    if(! wxFileExists(mapFile))

-      return FALSE;
+      return false;

 
    DeleteList();
    m_MapList = new wxList;
 
    DeleteList();
    m_MapList = new wxList;


@@ -289,7 +290,7 @@ bool wxExtHelpController::LoadFile(const wxString& ifile)
 
    FILE *input = wxFopen(mapFile,wxT("rt"));
    if(! input)
 
    FILE *input = wxFopen(mapFile,wxT("rt"));
    if(! input)

-      return FALSE;
+      return false;

    do
    {
       if(fgets(buffer,WXEXTHELP_BUFLEN,input) && *buffer != WXEXTHELP_COMMENTCHAR)
    do
    {
       if(fgets(buffer,WXEXTHELP_BUFLEN,input) && *buffer != WXEXTHELP_COMMENTCHAR)


@@ -301,13 +302,13 @@ bool wxExtHelpController::LoadFile(const wxString& ifile)
             break; // error
          for(i=0; isdigit(buffer[i])||isspace(buffer[i])||buffer[i]=='-'; i++)
             ; // find begin of URL
             break; // error
          for(i=0; isdigit(buffer[i])||isspace(buffer[i])||buffer[i]=='-'; i++)
             ; // find begin of URL

-         url = wxT("");
+         url = wxEmptyString;

          while(buffer[i] && ! isspace(buffer[i]) && buffer[i] !=
                WXEXTHELP_COMMENTCHAR)
             url << (wxChar) buffer[i++];
          while(buffer[i] && buffer[i] != WXEXTHELP_COMMENTCHAR)
             i++;
          while(buffer[i] && ! isspace(buffer[i]) && buffer[i] !=
                WXEXTHELP_COMMENTCHAR)
             url << (wxChar) buffer[i++];
          while(buffer[i] && buffer[i] != WXEXTHELP_COMMENTCHAR)
             i++;

-         doc = wxT("");
+         doc = wxEmptyString;

          if(buffer[i])
             doc = wxString::FromAscii( (buffer + i + 1) ); // skip the comment character
          m_MapList->Append(new wxExtHelpMapEntry(id,url,doc));
          if(buffer[i])
             doc = wxString::FromAscii( (buffer + i + 1) ); // skip the comment character
          m_MapList->Append(new wxExtHelpMapEntry(id,url,doc));


@@ -317,7 +318,7 @@ bool wxExtHelpController::LoadFile(const wxString& ifile)
    fclose(input);
 
    m_MapFile = file; // now it's valid
    fclose(input);
 
    m_MapFile = file; // now it's valid

-   return TRUE;
+   return true;

 }
 
 
 }
 
 


@@ -325,7 +326,7 @@ bool
 wxExtHelpController::DisplayContents()
 {
    if(! m_NumOfEntries)
 wxExtHelpController::DisplayContents()
 {
    if(! m_NumOfEntries)

-      return FALSE;
+      return false;

 
    wxString contents;
    wxList::compatibility_iterator node = m_MapList->GetFirst();
 
    wxString contents;
    wxList::compatibility_iterator node = m_MapList->GetFirst();


@@ -341,7 +342,7 @@ wxExtHelpController::DisplayContents()
       node = node->GetNext();
    }
 
       node = node->GetNext();
    }
 

-   bool rc = FALSE;
+   bool rc = false;

    wxString file;
    file << m_MapFile << WXEXTHELP_SEPARATOR << contents;
    if(file.Contains(wxT('#')))
    wxString file;
    file << m_MapFile << WXEXTHELP_SEPARATOR << contents;
    if(file.Contains(wxT('#')))


@@ -350,14 +351,14 @@ wxExtHelpController::DisplayContents()
       rc = DisplaySection(CONTENTS_ID);
 
    // if not found, open homemade toc:
       rc = DisplaySection(CONTENTS_ID);
 
    // if not found, open homemade toc:

-   return rc ? TRUE : KeywordSearch(wxT(""));
+   return rc ? true : KeywordSearch(wxEmptyString);

 }
 
 bool
 wxExtHelpController::DisplaySection(int sectionNo)
 {
    if(! m_NumOfEntries)
 }
 
 bool
 wxExtHelpController::DisplaySection(int sectionNo)
 {
    if(! m_NumOfEntries)

-      return FALSE;
+      return false;

 
    wxBusyCursor b; // display a busy cursor
    wxList::compatibility_iterator node = m_MapList->GetFirst();
 
    wxBusyCursor b; // display a busy cursor
    wxList::compatibility_iterator node = m_MapList->GetFirst();


@@ -369,7 +370,7 @@ wxExtHelpController::DisplaySection(int sectionNo)
          return DisplayHelp(entry->url);
       node = node->GetNext();
    }
          return DisplayHelp(entry->url);
       node = node->GetNext();
    }

-   return FALSE;
+   return false;

 }
 
 bool wxExtHelpController::DisplaySection(const wxString& section)
 }
 
 bool wxExtHelpController::DisplaySection(const wxString& section)


@@ -393,7 +394,7 @@ wxExtHelpController::KeywordSearch(const wxString& k,
                                    wxHelpSearchMode WXUNUSED(mode))
 {
    if(! m_NumOfEntries)
                                    wxHelpSearchMode WXUNUSED(mode))
 {
    if(! m_NumOfEntries)

-      return FALSE;
+      return false;

 
    wxString     *choices = new wxString[m_NumOfEntries];
    wxString     *urls = new wxString[m_NumOfEntries];
 
    wxString     *choices = new wxString[m_NumOfEntries];
    wxString     *urls = new wxString[m_NumOfEntries];


@@ -401,7 +402,7 @@ wxExtHelpController::KeywordSearch(const wxString& k,
 
    int          idx = 0, j;
    bool         rc;
 
    int          idx = 0, j;
    bool         rc;

-   bool         showAll = k.IsEmpty();
+   bool         showAll = k.empty();

    wxList::compatibility_iterator node = m_MapList->GetFirst();
    wxExtHelpMapEntry *entry;
 
    wxList::compatibility_iterator node = m_MapList->GetFirst();
    wxExtHelpMapEntry *entry;
 


@@ -412,14 +413,14 @@ wxExtHelpController::KeywordSearch(const wxString& k,
       {
          entry = (wxExtHelpMapEntry *)node->GetData();
          compB = entry->doc; compB.LowerCase();
       {
          entry = (wxExtHelpMapEntry *)node->GetData();
          compB = entry->doc; compB.LowerCase();

-         if((showAll || compB.Contains(k)) && ! compB.IsEmpty())
+         if((showAll || compB.Contains(k)) && ! compB.empty())

          {
             urls[idx] = entry->url;
             // doesn't work:
             // choices[idx] = (**i).doc.Contains((**i).doc.Before(WXEXTHELP_COMMENTCHAR));
          {
             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 ';'
+            //if(choices[idx].empty()) // didn't contain the ';'

             //   choices[idx] = (**i).doc;
             //   choices[idx] = (**i).doc;

-            choices[idx] = wxT("");
+            choices[idx] = wxEmptyString;

             for(j=0;entry->doc.c_str()[j]
                    && entry->doc.c_str()[j] != WXEXTHELP_COMMENTCHAR; j++)
                choices[idx] << entry->doc.c_str()[j];
             for(j=0;entry->doc.c_str()[j]
                    && entry->doc.c_str()[j] != WXEXTHELP_COMMENTCHAR; j++)
                choices[idx] << entry->doc.c_str()[j];


@@ -434,7 +435,7 @@ wxExtHelpController::KeywordSearch(const wxString& k,
    else if(idx == 0)
    {
       wxMessageBox(_("No entries found."));
    else if(idx == 0)
    {
       wxMessageBox(_("No entries found."));

-      rc = FALSE;
+      rc = false;

    }
    else
    {
    }
    else
    {


@@ -444,7 +445,7 @@ wxExtHelpController::KeywordSearch(const wxString& k,
       if(idx != -1)
          rc = DisplayHelp(urls[idx]);
       else
       if(idx != -1)
          rc = DisplayHelp(urls[idx]);
       else

-         rc = FALSE;
+         rc = false;

    }
    delete[] urls;
    delete[] choices;
    }
    delete[] urls;
    delete[] choices;


@@ -455,7 +456,7 @@ wxExtHelpController::KeywordSearch(const wxString& k,
 
 bool wxExtHelpController::Quit()
 {
 
 bool wxExtHelpController::Quit()
 {

-   return TRUE;
+   return true;

 }
 
 void wxExtHelpController::OnQuit()
 }
 
 void wxExtHelpController::OnQuit()