corrected warnings

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

diff --git a/src/generic/helpext.cpp b/src/generic/helpext.cpp
index 51ab04b34e642d4434f74c67c98daecae5e1efda..bfd3efb40390083c2aed79b68afc8601587f1313 100644 (file)
--- a/src/generic/helpext.cpp
+++ b/src/generic/helpext.cpp
@@ -40,8 +40,17 @@
     #include   <unistd.h>
 #endif
 
+#ifdef __WXMSW__
+#include <windows.h>
+#endif
+
 IMPLEMENT_CLASS(wxExtHelpController, wxHTMLHelpControllerBase)
 
+/// Name of environment variable to set help browser.
+#define   WXEXTHELP_ENVVAR_BROWSER   "WX_HELPBROWSER"
+/// Is browser a netscape browser?
+#define   WXEXTHELP_ENVVAR_BROWSERISNETSCAPE "WX_HELPBROWSER_NS"
+
 /**
    This class implements help via an external browser.
    It requires the name of a directory containing the documentation
@@ -77,7 +86,7 @@ void wxExtHelpController::SetViewer(const wxString& viewer, long flags)
 }
 
 bool
-wxExtHelpController::DisplayHelp(wxString const &relativeURL)
+wxExtHelpController::DisplayHelp(const wxString &relativeURL)
 {
    wxBusyCursor b; // display a busy cursor
 
@@ -85,7 +94,7 @@ wxExtHelpController::DisplayHelp(wxString const &relativeURL)
 #if defined(__WXMSW__)
    wxString url;
    url << m_MapFile << '\\' << relativeURL.BeforeFirst('#');
-   bool bOk = (int)ShellExecute(NULL, "open", url,
+   bool bOk = (int)ShellExecute(NULL, wxT("open"), url.c_str(),
                                 NULL, NULL, SW_SHOWNORMAL ) > 32;
    if ( !bOk )
    {
@@ -94,7 +103,9 @@ wxExtHelpController::DisplayHelp(wxString const &relativeURL)
    }
    else
       return true;
+
 #elif  defined(__WXPM__)
+
    wxString url;
    url << m_MapFile << '\\' << relativeURL.BeforeFirst('#');
 //   will have to fix for OS/2, later.....DW
@@ -107,19 +118,34 @@ wxExtHelpController::DisplayHelp(wxString const &relativeURL)
 //   }
 //   else
       return TRUE;
-#else
-   // assume UNIX
+
+#elif defined(__DOS__)
+
+   wxString command;
+   command = m_BrowserName;
+   command << wxT(" file://")
+           << m_MapFile << WXEXTHELP_SEPARATOR << relativeURL;
+   return wxExecute(command) != 0;
+
+#else // UNIX
    wxString command;
 
+#ifndef __EMX__
    if(m_BrowserIsNetscape) // try re-loading first
    {
       wxString lockfile;
       wxGetHomeDir(&lockfile);
+#ifdef __VMS__
+      lockfile << WXEXTHELP_SEPARATOR << wxT(".netscape]lock.");
+      struct stat statbuf;
+      if(stat(lockfile.fn_str(), &statbuf) == 0)
+#else
       lockfile << WXEXTHELP_SEPARATOR << wxT(".netscape/lock");
       struct stat statbuf;
       if(lstat(lockfile.fn_str(), &statbuf) == 0)
       // cannot use wxFileExists, because it's a link pointing to a
       // non-existing location      if(wxFileExists(lockfile))
+#endif
       {
          long success;
          command << m_BrowserName << wxT(" -remote openURL(")
@@ -130,6 +156,7 @@ wxExtHelpController::DisplayHelp(wxString const &relativeURL)
             return TRUE;
       }
    }
+#endif
    command = m_BrowserName;
    command << wxT(" file://")
            << m_MapFile << WXEXTHELP_SEPARATOR << relativeURL;