Avoid including pipe stream headers when streams are disabled.

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

diff --git a/include/wx/config.h b/include/wx/config.h
index d9ffb9fa58042f6b3ce6904afb7e62333b84f9c1..54e821d918bf3b9b331cf1d469702a7f44814f7b 100644 (file)
--- a/include/wx/config.h
+++ b/include/wx/config.h
@@ -1,17 +1,38 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/config.h
+// Purpose:     wxConfig base header
+// Author:      Julian Smart
+// Modified by:
+// Created:
+// Copyright:   (c) Julian Smart
+// RCS-ID:      $Id$
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+

 #ifndef _WX_CONFIG_H_BASE_
 #define _WX_CONFIG_H_BASE_
 
 #include "wx/confbase.h"
 
 #ifndef _WX_CONFIG_H_BASE_
 #define _WX_CONFIG_H_BASE_
 
 #include "wx/confbase.h"
 

-#if defined(__WXMSW__) && defined(wxCONFIG_WIN32_NATIVE)
-#  ifdef __WIN32__
-#    include "wx/msw/regconf.h"
-#else
-#    include "wx/msw/iniconf.h"
-#  endif
-#else
-#    include "wx/fileconf.h"
-#endif
+#if wxUSE_CONFIG
+
+// ----------------------------------------------------------------------------
+// define the native wxConfigBase implementation
+// ----------------------------------------------------------------------------

 
 

+// under Windows we prefer to use the native implementation but can be forced
+// to use the file-based one
+#if defined(__WINDOWS__) && wxUSE_CONFIG_NATIVE
+    #include "wx/msw/regconf.h"
+    #define wxConfig  wxRegConfig
+#elif defined(__WXOS2__) && wxUSE_CONFIG_NATIVE
+    #include "wx/os2/iniconf.h"
+    #define wxConfig wxIniConfig
+#else // either we're under Unix or wish to always use config files
+    #include "wx/fileconf.h"
+    #define wxConfig wxFileConfig

 #endif
 #endif

-    // _WX_CONFIG_H_BASE_
+
+#endif // wxUSE_CONFIG
+
+#endif // _WX_CONFIG_H_BASE_