Remove my binary compatibility stuff from HEAD. Patch #1367014 used for reference.

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

diff --git a/src/generic/helpext.cpp b/src/generic/helpext.cpp
index d8649e494fcfd5461b30742ccb6e3cf0b407c297..39c9f93735e304e525ca17ae2d0aaaa9b76f3188 100644 (file)
--- a/src/generic/helpext.cpp
+++ b/src/generic/helpext.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        helpext.cpp
-// Purpose:     an external help controller for wxWindows
+// Name:        src/generic/helpext.cpp
+// Purpose:     an external help controller for wxWidgets

 // Author:      Karsten Ballueder
 // Modified by:
 // Created:     04/01/98
 // Author:      Karsten Ballueder
 // Modified by:
 // Created:     04/01/98


@@ -9,17 +9,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#   pragma implementation "wxexthlp.h"
-#endif
-

 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 

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

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


@@ -27,6 +23,9 @@
     #include "wx/utils.h"
     #include "wx/list.h"
     #include "wx/intl.h"
     #include "wx/utils.h"
     #include "wx/list.h"
     #include "wx/intl.h"

+    #include "wx/msgdlg.h"
+    #include "wx/choicdlg.h"
+    #include "wx/log.h"

 #endif
 
 #include "wx/helpbase.h"
 #endif
 
 #include "wx/helpbase.h"


@@ -40,8 +39,13 @@
     #include   <unistd.h>
 #endif
 
     #include   <unistd.h>
 #endif
 

+#ifdef __WINDOWS__
+#include "wx/msw/mslu.h"
+#endif
+

 #ifdef __WXMSW__
 #include <windows.h>
 #ifdef __WXMSW__
 #include <windows.h>

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

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


@@ -70,7 +74,8 @@ IMPLEMENT_CLASS(wxExtHelpController, wxHelpControllerBase)
    and a file mapping numerical Section numbers to relative URLS.
 */
 
    and a file mapping numerical Section numbers to relative URLS.
 */
 

-wxExtHelpController::wxExtHelpController()
+wxExtHelpController::wxExtHelpController(wxWindow* parentWindow):
+    wxHelpControllerBase(parentWindow)

 {
    m_MapList = (wxList*) NULL;
    m_NumOfEntries = 0;
 {
    m_MapList = (wxList*) NULL;
    m_NumOfEntries = 0;


@@ -119,10 +124,9 @@ wxExtHelpController::DisplayHelp(const wxString &relativeURL)
       wxLogSysError(_("Cannot open URL '%s'"), relativeURL.c_str());
       return false;
    }
       wxLogSysError(_("Cannot open URL '%s'"), relativeURL.c_str());
       return false;
    }

-   else
-      return true;

 
 

-#elif  defined(__WXPM__)
+   return true;
+#elif  defined(__OS2__)

 
    wxString url;
    url << m_MapFile << '\\' << relativeURL.BeforeFirst('#');
 
    wxString url;
    url << m_MapFile << '\\' << relativeURL.BeforeFirst('#');


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

-      return TRUE;
+      return true;

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


@@ -171,7 +175,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


@@ -196,11 +200,11 @@ void wxExtHelpController::DeleteList()
 {
    if(m_MapList)
    {
 {
    if(m_MapList)
    {

-      wxNode *node = m_MapList->GetFirst();
+      wxList::compatibility_iterator node = m_MapList->GetFirst();

       while (node)
       {
          delete (wxExtHelpMapEntry *)node->GetData();
       while (node)
       {
          delete (wxExtHelpMapEntry *)node->GetData();

-         delete node;
+         m_MapList->Erase(node);

          node = m_MapList->GetFirst();
       }
       delete m_MapList;
          node = m_MapList->GetFirst();
       }
       delete m_MapList;


@@ -229,14 +233,12 @@ 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))
       {

-         wxChar* f = wxGetWorkingDirectory();
-         file = f;
-         delete[] f; // wxGetWorkingDirectory returns new memory
+         file = wxGetCwd();

 #ifdef __WXMAC__
          file << ifile;
 #else
 #ifdef __WXMAC__
          file << ifile;
 #else


@@ -252,7 +254,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();


@@ -271,7 +273,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;
    }


@@ -279,7 +281,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;


@@ -287,7 +289,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)


@@ -299,13 +301,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));


@@ -315,7 +317,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;

 }
 
 
 }
 
 


@@ -323,10 +325,10 @@ bool
 wxExtHelpController::DisplayContents()
 {
    if(! m_NumOfEntries)
 wxExtHelpController::DisplayContents()
 {
    if(! m_NumOfEntries)

-      return FALSE;
+      return false;

 
    wxString contents;
 
    wxString contents;

-   wxNode *node = m_MapList->GetFirst();
+   wxList::compatibility_iterator node = m_MapList->GetFirst();

    wxExtHelpMapEntry *entry;
    while(node)
    {
    wxExtHelpMapEntry *entry;
    while(node)
    {


@@ -339,26 +341,26 @@ 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('#')))
       file = file.BeforeLast(wxT('#'));
    wxString file;
    file << m_MapFile << WXEXTHELP_SEPARATOR << contents;
    if(file.Contains(wxT('#')))
       file = file.BeforeLast(wxT('#'));

-   if(contents.Length() && wxFileExists(file))
+   if(contents.length() && wxFileExists(file))

       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
 
    wxBusyCursor b; // display a busy cursor

-   wxNode *node = m_MapList->GetFirst();
+   wxList::compatibility_iterator node = m_MapList->GetFirst();

    wxExtHelpMapEntry *entry;
    while(node)
    {
    wxExtHelpMapEntry *entry;
    while(node)
    {


@@ -367,7 +369,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)


@@ -387,10 +389,11 @@ wxExtHelpController::DisplayBlock(long blockNo)
 }
 
 bool
 }
 
 bool

-wxExtHelpController::KeywordSearch(const wxString& k)
+wxExtHelpController::KeywordSearch(const wxString& k,
+                                   wxHelpSearchMode WXUNUSED(mode))

 {
    if(! m_NumOfEntries)
 {
    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];


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

-   bool         showAll = k.IsEmpty();
-   wxNode       *node = m_MapList->GetFirst();
+   bool         showAll = k.empty();
+   wxList::compatibility_iterator node = m_MapList->GetFirst();

    wxExtHelpMapEntry *entry;
 
    {
    wxExtHelpMapEntry *entry;
 
    {


@@ -409,14 +412,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];


@@ -431,7 +434,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
    {


@@ -441,7 +444,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;


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

-   return TRUE;
+   return true;

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


@@ -461,4 +464,3 @@ void wxExtHelpController::OnQuit()
 
 
 #endif // wxUSE_HELP
 
 
 #endif // wxUSE_HELP

-