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 83183c926a24b0e01aecb75237dd555971c099e9..4536efb4fbec529e3dbb6e0be9721594c17620f9 100644 (file)
--- 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:
 // Purpose:     wxSystemOptions
 // Author:      Julian Smart
 // Modified by:


@@ -26,14 +26,15 @@
 
 #if wxUSE_SYSTEM_OPTIONS
 
 
 #if wxUSE_SYSTEM_OPTIONS
 

+#include "wx/sysopt.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

+    #include "wx/app.h"

     #include "wx/list.h"
     #include "wx/list.h"

+    #include "wx/string.h"
+    #include "wx/arrstr.h"

 #endif
 
 #endif
 

-#include "wx/string.h"
-#include "wx/sysopt.h"
-#include "wx/arrstr.h"
-

 // ----------------------------------------------------------------------------
 // private globals
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // private globals
 // ----------------------------------------------------------------------------


@@ -68,22 +69,44 @@ void wxSystemOptions::SetOption(const wxString& name, int value)
 
 wxString wxSystemOptions::GetOption(const wxString& name)
 {
 
 wxString wxSystemOptions::GetOption(const wxString& name)
 {

+    wxString val;
+

     int idx = gs_optionNames.Index(name, false);
     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 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 )
+            appname = wxTheApp->GetAppName();
+
+        if ( !appname.empty() )
+            val = wxGetenv(wxT("wx_") + appname + wxT('_') + var);
+
+        if ( val.empty() )
+            val = wxGetenv(wxT("wx_") + var);
+    }
+
+    return val;

 }
 
 int wxSystemOptions::GetOptionInt(const wxString& name)
 {
 }
 
 int wxSystemOptions::GetOptionInt(const wxString& name)
 {

-    return wxAtoi(GetOption(name));
+    return wxAtoi (GetOption(name));

 }
 
 bool wxSystemOptions::HasOption(const wxString& name)
 {
 }
 
 bool wxSystemOptions::HasOption(const wxString& name)
 {

-    return gs_optionNames.Index(name, false) != wxNOT_FOUND;
+    return !GetOption(name).empty();

 }
 
 #endif // wxUSE_SYSTEM_OPTIONS
 }
 
 #endif // wxUSE_SYSTEM_OPTIONS

-