From 05c0fe0df0be9aba5a0d6269871cf39739b5c76c Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Mon, 28 Sep 2009 10:02:42 +0000 Subject: [PATCH] Applied #10560 (Missing wxUSE_CONFIG checks.) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@62185 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/iniconf.h | 8 +++++++- include/wx/msw/regconf.h | 8 +++++++- include/wx/palmos/prefconf.h | 7 ++++++- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/include/wx/msw/iniconf.h b/include/wx/msw/iniconf.h index 81872a9290..880746f406 100644 --- a/include/wx/msw/iniconf.h +++ b/include/wx/msw/iniconf.h @@ -12,6 +12,10 @@ #ifndef _INICONF_H #define _INICONF_H +#include "wx/defs.h" + +#if wxUSE_CONFIG + // ---------------------------------------------------------------------------- // wxIniConfig is a wxConfig implementation which uses MS Windows INI files to // store the data. Because INI files don't really support arbitrary nesting of @@ -92,4 +96,6 @@ private: m_strPath; // the rest of the path (no trailing '_'!) }; -#endif //_INICONF_H +#endif // wxUSE_CONFIG + +#endif // _INICONF_H diff --git a/include/wx/msw/regconf.h b/include/wx/msw/regconf.h index ff886d1796..625c3cc522 100644 --- a/include/wx/msw/regconf.h +++ b/include/wx/msw/regconf.h @@ -12,6 +12,10 @@ #ifndef _REGCONF_H #define _REGCONF_H +#include "wx/defs.h" + +#if wxUSE_CONFIG + #ifndef _REGISTRY_H #include "wx/msw/registry.h" #endif @@ -107,4 +111,6 @@ private: wxString m_strPath; }; -#endif //_REGCONF_H +#endif // wxUSE_CONFIG + +#endif // _REGCONF_H diff --git a/include/wx/palmos/prefconf.h b/include/wx/palmos/prefconf.h index e5f7f4104a..89d8c485d3 100644 --- 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 // ---------------------------------------------------------------------------- @@ -86,5 +90,6 @@ private: bool m_modGroup; }; -#endif // _PREFCONF_H_ +#endif // wxUSE_CONFIG +#endif // _PREFCONF_H_