From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 24 Nov 2004 21:25:55 +0000 (+0000)
Subject: define inline stubs for methods even with wxUSE_SYSTEM_OPTIONS == 0 to make it possib... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/1972900ebf36cdec7feb9083854a12ef4bf45d2c

define inline stubs for methods even with wxUSE_SYSTEM_OPTIONS == 0 to make it possible to test for system options without #ifdefs


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30772 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/sysopt.h b/include/wx/sysopt.h
index 5981d3cd2d..90d802215b 100644
--- a/include/wx/sysopt.h
+++ b/include/wx/sysopt.h
@@ -14,8 +14,6 @@
 
 #include "wx/object.h"
 
-#if wxUSE_SYSTEM_OPTIONS
-
 // ----------------------------------------------------------------------------
 // Enables an application to influence the wxWidgets implementation
 // ----------------------------------------------------------------------------
@@ -29,15 +27,39 @@ public:
     // 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 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);
 };
 
-#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_