X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..6aab927940dd5896e115e4ac9485a238ec4aeec3:/src/common/sysopt.cpp

diff --git a/src/common/sysopt.cpp b/src/common/sysopt.cpp
index 83183c926a..d27f46c726 100644
--- a/src/common/sysopt.cpp
+++ b/src/common/sysopt.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        common/sysopt.cpp
+// Name:        src/common/sysopt.cpp
 // Purpose:     wxSystemOptions
 // Author:      Julian Smart
 // Modified by:
@@ -26,14 +26,15 @@
 
 #if wxUSE_SYSTEM_OPTIONS
 
+#include "wx/sysopt.h"
+
 #ifndef WX_PRECOMP
+    #include "wx/app.h"
     #include "wx/list.h"
+    #include "wx/string.h"
+    #include "wx/arrstr.h"
 #endif
 
-#include "wx/string.h"
-#include "wx/sysopt.h"
-#include "wx/arrstr.h"
-
 // ----------------------------------------------------------------------------
 // private globals
 // ----------------------------------------------------------------------------
@@ -68,22 +69,48 @@ void wxSystemOptions::SetOption(const wxString& name, int value)
 
 wxString wxSystemOptions::GetOption(const wxString& name)
 {
+    wxString val;
+
     int idx = gs_optionNames.Index(name, false);
-    if (idx == wxNOT_FOUND)
-        return wxEmptyString;
-    else
-        return gs_optionValues[idx];
+    if ( idx != wxNOT_FOUND )
+    {
+        val = gs_optionValues[idx];
+    }
+    else // not set explicitely
+    {
+        // 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
+
+        wxString appname;
+        if ( wxTheApp )
+            appname = wxTheApp->GetAppName();
+
+        if ( !appname.empty() )
+            val = wxGetenv(_T("wx_") + appname + _T('_') + var);
+
+        if ( val.empty() )
+            val = wxGetenv(_T("wx_") + var);
+    }
+
+    return val;
 }
 
 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)
 {
-    return gs_optionNames.Index(name, false) != wxNOT_FOUND;
+    return !GetOption(name).empty();
 }
 
 #endif // wxUSE_SYSTEM_OPTIONS
-