Added a comment about the 'UpdateWindow' issue in SetScrollBars()

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

diff --git a/src/generic/helpext.cpp b/src/generic/helpext.cpp
index 56a293ca4259b0c878c82ceb17ce6327e6e5681d..abac8364523d8a942edaa905b5eb64763da25e2c 100644 (file)
--- a/src/generic/helpext.cpp
+++ b/src/generic/helpext.cpp
@@ -36,7 +36,7 @@
 #include <ctype.h>
 #include <sys/stat.h>
 
-#ifndef __WINDOWS__
+#if !defined(__WINDOWS__) && !defined(__OS2__)
     #include   <unistd.h>
 #endif
 
@@ -82,7 +82,7 @@ wxExtHelpController::DisplayHelp(wxString const &relativeURL)
    wxBusyCursor b; // display a busy cursor
 
 
-#ifdef __WXMSW__
+#if defined(__WXMSW__)
    wxString url;
    url << m_MapFile << '\\' << relativeURL.BeforeFirst('#');
    bool bOk = (int)ShellExecute(NULL, "open", url,
@@ -94,6 +94,19 @@ 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
+//   bool bOk = (int)ShellExecute(NULL, "open", url,
+//                                NULL, NULL, SW_SHOWNORMAL ) > 32;
+//   if ( !bOk )
+//   {
+//      wxLogSysError(_("Cannot open URL '%s'"), relativeURL.c_str());
+//      return false;
+//   }
+//   else
+      return TRUE;
 #else
    // assume UNIX
    wxString command;
@@ -102,23 +115,29 @@ wxExtHelpController::DisplayHelp(wxString const &relativeURL)
    {
       wxString lockfile;
       wxGetHomeDir(&lockfile);
-      lockfile << WXEXTHELP_SEPARATOR << T(".netscape/lock");
+#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 << T(" -remote openURL(")
-                 << T("file://") << m_MapFile
-                 << WXEXTHELP_SEPARATOR << relativeURL << T(")");
+         command << m_BrowserName << wxT(" -remote openURL(")
+                 << wxT("file://") << m_MapFile
+                 << WXEXTHELP_SEPARATOR << relativeURL << wxT(")");
          success = wxExecute(command);
          if(success != 0 ) // returns PID on success
             return TRUE;
       }
    }
    command = m_BrowserName;
-   command << T(" file://")
+   command << wxT(" file://")
            << m_MapFile << WXEXTHELP_SEPARATOR << relativeURL;
    return wxExecute(command) != 0;
 #endif