Don't define __STRICT_ANSI__, we should build both with and without it.

[wxWidgets.git] / include / wx / sysopt.h

diff --git a/include/wx/sysopt.h b/include/wx/sysopt.h
index 27d7f1339ee708a21e38d62ca187e5ff52bf946f..63474c0660a80c7af72fbdbe445398026f94ed98 100644 (file)
--- a/include/wx/sysopt.h
+++ b/include/wx/sysopt.h
@@ -1,12 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        sysopt.h
+// Name:        wx/sysopt.h

 // Purpose:     wxSystemOptions
 // Author:      Julian Smart
 // Modified by:
 // Created:     2001-07-10
 // Purpose:     wxSystemOptions
 // Author:      Julian Smart
 // Modified by:
 // Created:     2001-07-10

-// RCS-ID:      $Id$

 // Copyright:   (c) Julian Smart
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SYSOPT_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SYSOPT_H_


@@ -14,13 +13,15 @@
 
 #include "wx/object.h"
 
 
 #include "wx/object.h"
 

-#if wxUSE_SYSTEM_OPTIONS
-

 // ----------------------------------------------------------------------------
 // Enables an application to influence the wxWidgets implementation
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // Enables an application to influence the wxWidgets implementation
 // ----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_BASE wxSystemOptions : public wxObject
+class
+#if wxUSE_SYSTEM_OPTIONS
+WXDLLIMPEXP_BASE
+#endif
+wxSystemOptions : public wxObject

 {
 public:
     wxSystemOptions() { }
 {
 public:
     wxSystemOptions() { }


@@ -29,15 +30,44 @@ public:
     // These could also be used to influence GetSystem... calls, indeed
     // to implement SetSystemColour/Font/Metric
 
     // These could also be used to influence GetSystem... calls, indeed
     // to implement SetSystemColour/Font/Metric
 

+#if wxUSE_SYSTEM_OPTIONS

     static void SetOption(const wxString& name, const wxString& value);
     static void SetOption(const wxString& name, int value);
     static void SetOption(const wxString& name, const wxString& value);
     static void SetOption(const wxString& name, int value);

-    static wxString GetOption(const wxString& name) ;
-    static int GetOptionInt(const wxString& name) ;
-    static bool HasOption(const wxString& name) ;
+#endif // wxUSE_SYSTEM_OPTIONS
+    static wxString GetOption(const wxString& name);
+    static int GetOptionInt(const wxString& name);
+    static bool HasOption(const wxString& name);
+
+    static bool IsFalse(const wxString& name)
+    {
+        return HasOption(name) && GetOptionInt(name) == 0;
+    }

 };
 
 };
 

-#endif
+#if !wxUSE_SYSTEM_OPTIONS
+
+// define inline stubs for accessors to make it possible to use wxSystemOptions
+// in the library itself without checking for wxUSE_SYSTEM_OPTIONS all the time
+
+/* static */ inline
+wxString wxSystemOptions::GetOption(const wxString& WXUNUSED(name))
+{
+    return wxEmptyString;
+}
+
+/* static */ inline
+int wxSystemOptions::GetOptionInt(const wxString& WXUNUSED(name))
+{
+    return 0;
+}
+
+/* static */ inline
+bool wxSystemOptions::HasOption(const wxString& WXUNUSED(name))
+{
+    return false;
+}

 
 

+#endif // !wxUSE_SYSTEM_OPTIONS

 
 #endif
     // _WX_SYSOPT_H_
 
 #endif
     // _WX_SYSOPT_H_