X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fcb9fb91ff1a9795a484a2fd89728a13f7b2ba11..a4ea083bbdf710d3234dcbd2eafb5d0e078f8348:/src/common/sysopt.cpp

diff --git a/src/common/sysopt.cpp b/src/common/sysopt.cpp
index d27f46c726..ede2e7a547 100644
--- a/src/common/sysopt.cpp
+++ b/src/common/sysopt.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     2001-07-10
-// RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -76,23 +75,24 @@ wxString wxSystemOptions::GetOption(const wxString& name)
     {
         val = gs_optionValues[idx];
     }
-    else // not set explicitely
+    else // not set explicitly
     {
         // look in the environment: first for a variable named "wx_appname_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
+        var.Replace(wxT("-"), wxT("_"));  // and neither are '-'s
 
         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,12 +100,7 @@ wxString wxSystemOptions::GetOption(const wxString& name)
 
 int wxSystemOptions::GetOptionInt(const wxString& 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)