post wxUniv merge fixes

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

diff --git a/src/generic/helpext.cpp b/src/generic/helpext.cpp
index 51ab04b34e642d4434f74c67c98daecae5e1efda..8f6276fb25bacd9161cb009281a2d9b07d3c1df7 100644 (file)
--- a/src/generic/helpext.cpp
+++ b/src/generic/helpext.cpp
@@ -40,6 +40,10 @@
     #include   <unistd.h>
 #endif
 
     #include   <unistd.h>
 #endif
 

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

 IMPLEMENT_CLASS(wxExtHelpController, wxHTMLHelpControllerBase)
 
 /**
 IMPLEMENT_CLASS(wxExtHelpController, wxHTMLHelpControllerBase)
 
 /**


@@ -77,7 +81,7 @@ void wxExtHelpController::SetViewer(const wxString& viewer, long flags)
 }
 
 bool
 }
 
 bool

-wxExtHelpController::DisplayHelp(wxString const &relativeURL)
+wxExtHelpController::DisplayHelp(const wxString &relativeURL)

 {
    wxBusyCursor b; // display a busy cursor
 
 {
    wxBusyCursor b; // display a busy cursor
 


@@ -85,7 +89,7 @@ wxExtHelpController::DisplayHelp(wxString const &relativeURL)
 #if defined(__WXMSW__)
    wxString url;
    url << m_MapFile << '\\' << relativeURL.BeforeFirst('#');
 #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 )
    {
                                 NULL, NULL, SW_SHOWNORMAL ) > 32;
    if ( !bOk )
    {


@@ -115,12 +119,18 @@ wxExtHelpController::DisplayHelp(wxString const &relativeURL)
    {
       wxString lockfile;
       wxGetHomeDir(&lockfile);
    {
       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))
       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(")
                  << wxT("file://") << m_MapFile
          long success;
          command << m_BrowserName << wxT(" -remote openURL(")
                  << wxT("file://") << m_MapFile