replaced T() makro with wxT() due to namespace probs, _T() exists, too
fixed compilation problems, mainly in html code compiles and links fine on Solaris, runs with samples and Mahogany git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -102,23 +102,23 @@ wxExtHelpController::DisplayHelp(wxString const &relativeURL)
|
||||
{
|
||||
wxString lockfile;
|
||||
wxGetHomeDir(&lockfile);
|
||||
lockfile << WXEXTHELP_SEPARATOR << T(".netscape/lock");
|
||||
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))
|
||||
{
|
||||
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
|
||||
|
Reference in New Issue
Block a user