Update version to 2.9.4 in version.bkl too and rebake everything.

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

diff --git a/src/common/sysopt.cpp b/src/common/sysopt.cpp
index 56227995c9edb0db31ea296cceddd7c61d1f258f..8b117011d243d5f1748f2dfc64ea07abe8d5619a 100644 (file)
--- a/src/common/sysopt.cpp
+++ b/src/common/sysopt.cpp
@@ -76,23 +76,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,7 +101,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)