Moved the cleanup code to an EVT_WINDOW_DESTROY handler.

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

diff --git a/src/generic/helpext.cpp b/src/generic/helpext.cpp
index 8f6276fb25bacd9161cb009281a2d9b07d3c1df7..9f165b3a5040ee86a72b2debc39174bfa9d3a414 100644 (file)
--- a/src/generic/helpext.cpp
+++ b/src/generic/helpext.cpp
@@ -46,6 +46,11 @@
 
 IMPLEMENT_CLASS(wxExtHelpController, wxHTMLHelpControllerBase)
 
 
 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
 /**
    This class implements help via an external browser.
    It requires the name of a directory containing the documentation


@@ -98,7 +103,9 @@ wxExtHelpController::DisplayHelp(const wxString &relativeURL)
    }
    else
       return true;
    }
    else
       return true;

+

 #elif  defined(__WXPM__)
 #elif  defined(__WXPM__)

+

    wxString url;
    url << m_MapFile << '\\' << relativeURL.BeforeFirst('#');
 //   will have to fix for OS/2, later.....DW
    wxString url;
    url << m_MapFile << '\\' << relativeURL.BeforeFirst('#');
 //   will have to fix for OS/2, later.....DW


@@ -111,8 +118,16 @@ wxExtHelpController::DisplayHelp(const wxString &relativeURL)
 //   }
 //   else
       return TRUE;
 //   }
 //   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;
 
    if(m_BrowserIsNetscape) // try re-loading first
    wxString command;
 
    if(m_BrowserIsNetscape) // try re-loading first


@@ -130,7 +145,7 @@ wxExtHelpController::DisplayHelp(const wxString &relativeURL)
       // cannot use wxFileExists, because it's a link pointing to a
       // non-existing location      if(wxFileExists(lockfile))
 #endif
       // 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