add wxUSE_CONFIG checks (see #10560)

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

diff --git a/include/wx/msw/iniconf.h b/include/wx/msw/iniconf.h
index c500b2ed421017bd5781437c241fd30c0a9dc433..dc30fd3aa7ad460bfc29f79625ae4ed7982aeb80 100644 (file)
--- a/include/wx/msw/iniconf.h
+++ b/include/wx/msw/iniconf.h
@@ -12,7 +12,9 @@
 #ifndef   _WX_MSW_INICONF_H_
 #define   _WX_MSW_INICONF_H_
 
-#if wxUSE_INICONF
+#include "wx/defs.h"
+
+#if wxUSE_CONFIG && wxUSE_INICONF
 
 // ----------------------------------------------------------------------------
 // wxIniConfig is a wxConfig implementation which uses MS Windows INI files to
@@ -99,6 +101,6 @@ private:
   DECLARE_ABSTRACT_CLASS(wxIniConfig)
 };
 
-#endif // wxUSE_INICONF
+#endif // wxUSE_CONFIG && wxUSE_INICONF
 
-#endif  //_WX_MSW_INICONF_H_
+#endif // _WX_MSW_INICONF_H_

diff --git a/include/wx/palmos/prefconf.h b/include/wx/palmos/prefconf.h
index 6f7a5af4de92dd0588c87df234c1d67a6d217491..dabcaef369e0c3f40d83ba688ac226db1ff8f9cc 100644 (file)
--- a/include/wx/palmos/prefconf.h
+++ b/include/wx/palmos/prefconf.h
@@ -12,6 +12,10 @@
 #ifndef _PREFCONF_H_
 #define _PREFCONF_H_
 
+#include "wx/defs.h"
+
+#if wxUSE_CONFIG
+
 // ----------------------------------------------------------------------------
 // wxPrefConfig
 // ----------------------------------------------------------------------------
@@ -87,5 +91,6 @@ private:
   DECLARE_ABSTRACT_CLASS(wxPrefConfig)
 };
 
-#endif // _PREFCONF_H_
+#endif // wxUSE_CONFIG
 
+#endif // _PREFCONF_H_