support SDK < 10.6, fixes #14902

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

diff --git a/include/wx/config.h b/include/wx/config.h
index 2028c217ae935773c21eaa173f42c2d9962558cb..54e821d918bf3b9b331cf1d469702a7f44814f7b 100644 (file)
--- a/include/wx/config.h
+++ b/include/wx/config.h
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxConfig base header
 // Purpose:     wxConfig base header

-// Author:      wxWidgets Team
+// Author:      Julian Smart

 // Modified by:
 // Created:
 // Modified by:
 // Created:

-// Copyright:   (c) wxWidgets Team
+// Copyright:   (c) Julian Smart

 // RCS-ID:      $Id$
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // RCS-ID:      $Id$
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -12,20 +12,27 @@
 #ifndef _WX_CONFIG_H_BASE_
 #define _WX_CONFIG_H_BASE_
 
 #ifndef _WX_CONFIG_H_BASE_
 #define _WX_CONFIG_H_BASE_
 

-#include "wx/defs.h"

 #include "wx/confbase.h"
 
 #include "wx/confbase.h"
 

-#if defined(__WXMSW__) && wxUSE_CONFIG_NATIVE
-#    ifdef __WIN32__
-#        include "wx/msw/regconf.h"
-#    else
-#        include "wx/msw/iniconf.h"
-#    endif
-#elif defined(__WXPALMOS__) && wxUSE_CONFIG_NATIVE
-#    include "wx/palmos/prefconf.h"
-#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_