Applied patch [ 603104 ] wxX11 wxClientDC, wxPaintDC fix

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

diff --git a/src/generic/helpext.cpp b/src/generic/helpext.cpp
index 66f90962401e12212e6de8bbed2032ebc939cc3a..bfd3efb40390083c2aed79b68afc8601587f1313 100644 (file)
--- a/src/generic/helpext.cpp
+++ b/src/generic/helpext.cpp
@@ -46,6 +46,11 @@
 
 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
@@ -125,6 +130,7 @@ wxExtHelpController::DisplayHelp(const wxString &relativeURL)
 #else // UNIX
    wxString command;
 
+#ifndef __EMX__
    if(m_BrowserIsNetscape) // try re-loading first
    {
       wxString lockfile;
@@ -140,7 +146,7 @@ wxExtHelpController::DisplayHelp(const wxString &relativeURL)
       // 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
@@ -150,6 +156,7 @@ wxExtHelpController::DisplayHelp(const wxString &relativeURL)
             return TRUE;
       }
    }
+#endif
    command = m_BrowserName;
    command << wxT(" file://")
            << m_MapFile << WXEXTHELP_SEPARATOR << relativeURL;