Compilation fix for r74440 and STL builds.

[wxWidgets.git] / src / common / sysopt.cpp

diff --git a/src/common/sysopt.cpp b/src/common/sysopt.cpp
index c9834763beb14c24f21a4921c8dff9773aead9f9..4536efb4fbec529e3dbb6e0be9721594c17620f9 100644 (file)
--- a/src/common/sysopt.cpp
+++ b/src/common/sysopt.cpp
@@ -76,13 +76,14 @@ 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(wxT("."), wxT("_"));  // '.'s not allowed in env var names
+        var.Replace(wxT("-"), wxT("_"));  // and neither are '-'s
 
         wxString appname;
         if ( wxTheApp )
@@ -100,12 +101,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)