X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bf85ddfc8a05c4d8306a1dc013bc2af7eccac00d..51c72a7b56ea50fb3c9b082da1bbaddf6a218073:/src/common/sysopt.cpp diff --git a/src/common/sysopt.cpp b/src/common/sysopt.cpp index 56227995c9..c9834763be 100644 --- a/src/common/sysopt.cpp +++ b/src/common/sysopt.cpp @@ -82,17 +82,17 @@ wxString wxSystemOptions::GetOption(const wxString& name) // which can be set to affect the behaviour or just this application // and then for "wx_name" which can be set to change the option globally wxString var(name); - var.Replace(_T("."), _T("_")); // '.'s not allowed in env var names + var.Replace(wxT("."), wxT("_")); // '.'s not allowed in env var names wxString appname; if ( wxTheApp ) appname = wxTheApp->GetAppName(); if ( !appname.empty() ) - val = wxGetenv(_T("wx_") + appname + _T('_') + var); + val = wxGetenv(wxT("wx_") + appname + wxT('_') + var); if ( val.empty() ) - val = wxGetenv(_T("wx_") + var); + val = wxGetenv(wxT("wx_") + var); } return val; @@ -100,7 +100,12 @@ wxString wxSystemOptions::GetOption(const wxString& name) int wxSystemOptions::GetOptionInt(const wxString& name) { - return wxAtoi(GetOption(name)); +#ifdef _PACC_VER + // work around the PalmOS pacc compiler bug + return wxAtoi (GetOption(name).data()); +#else + return wxAtoi (GetOption(name)); +#endif } bool wxSystemOptions::HasOption(const wxString& name)