(probably) fixed wxLocale::Init with Borland C++

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

diff --git a/src/generic/helpext.cpp b/src/generic/helpext.cpp
index 9f165b3a5040ee86a72b2debc39174bfa9d3a414..f6e3add7b5afc49dd8035357537d100ac733858e 100644 (file)
--- a/src/generic/helpext.cpp
+++ b/src/generic/helpext.cpp
@@ -47,9 +47,9 @@
 IMPLEMENT_CLASS(wxExtHelpController, wxHTMLHelpControllerBase)
 
 /// Name of environment variable to set help browser.
 IMPLEMENT_CLASS(wxExtHelpController, wxHTMLHelpControllerBase)
 
 /// Name of environment variable to set help browser.

-#define   WXEXTHELP_ENVVAR_BROWSER   "WX_HELPBROWSER"
+#define   WXEXTHELP_ENVVAR_BROWSER   wxT("WX_HELPBROWSER")

 /// Is browser a netscape browser?
 /// Is browser a netscape browser?

-#define   WXEXTHELP_ENVVAR_BROWSERISNETSCAPE "WX_HELPBROWSER_NS"
+#define   WXEXTHELP_ENVVAR_BROWSERISNETSCAPE wxT("WX_HELPBROWSER_NS")

 
 /**
    This class implements help via an external browser.
 
 /**
    This class implements help via an external browser.


@@ -62,18 +62,17 @@ wxExtHelpController::wxExtHelpController(void)
    m_BrowserName = WXEXTHELP_DEFAULTBROWSER;
    m_BrowserIsNetscape = WXEXTHELP_DEFAULTBROWSER_IS_NETSCAPE;
 
    m_BrowserName = WXEXTHELP_DEFAULTBROWSER;
    m_BrowserIsNetscape = WXEXTHELP_DEFAULTBROWSER_IS_NETSCAPE;
 

-   char *browser = getenv(WXEXTHELP_ENVVAR_BROWSER);
+   wxChar *browser = wxGetenv(WXEXTHELP_ENVVAR_BROWSER);

    if(browser)
    {
       m_BrowserName = browser;
    if(browser)
    {
       m_BrowserName = browser;

-      browser = getenv(WXEXTHELP_ENVVAR_BROWSERISNETSCAPE);
-      m_BrowserIsNetscape = browser && (atoi(browser) != 0);
+      browser = wxGetenv(WXEXTHELP_ENVVAR_BROWSERISNETSCAPE);
+      m_BrowserIsNetscape = browser && (wxAtoi(browser) != 0);

    }
 }
 
 
    }
 }
 
 

-void
-wxExtHelpController::SetBrowser(wxString const & browsername, bool isNetscape)
+void wxExtHelpController::SetBrowser(wxString const & browsername, bool isNetscape)

 {
    m_BrowserName = browsername;
    m_BrowserIsNetscape = isNetscape;
 {
    m_BrowserName = browsername;
    m_BrowserIsNetscape = isNetscape;


@@ -130,6 +129,7 @@ wxExtHelpController::DisplayHelp(const wxString &relativeURL)
 #else // UNIX
    wxString command;
 
 #else // UNIX
    wxString command;
 

+#ifndef __EMX__

    if(m_BrowserIsNetscape) // try re-loading first
    {
       wxString lockfile;
    if(m_BrowserIsNetscape) // try re-loading first
    {
       wxString lockfile;


@@ -155,6 +155,7 @@ wxExtHelpController::DisplayHelp(const wxString &relativeURL)
             return TRUE;
       }
    }
             return TRUE;
       }
    }

+#endif

    command = m_BrowserName;
    command << wxT(" file://")
            << m_MapFile << WXEXTHELP_SEPARATOR << relativeURL;
    command = m_BrowserName;
    command << wxT(" file://")
            << m_MapFile << WXEXTHELP_SEPARATOR << relativeURL;