From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 2 Mar 2008 01:14:16 +0000 (+0000)
Subject: define wxConfig where the header implementing it is defined; also define it for wxPal... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/f0d3a2cc93915912ba879ec94d813043d7d60a36

define wxConfig where the header implementing it is defined; also define it for wxPalm and wxOS2 (confmove.diff part of patch 1894861)

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

diff --git a/include/wx/confbase.h b/include/wx/confbase.h
index 022fb64857..5192df40db 100644
--- a/include/wx/confbase.h
+++ b/include/wx/confbase.h
@@ -428,18 +428,6 @@ private:
 };
 
 
-// ----------------------------------------------------------------------------
-// the native wxConfigBase implementation
-// ----------------------------------------------------------------------------
-
-// under Windows we prefer to use the native implementation
-// wxIniConfig isn't native anywhere after droping win16 in wxWidgets 2.6
-#if defined(__WXMSW__) && wxUSE_CONFIG_NATIVE
-    #define wxConfig  wxRegConfig
-#else // either we're under Unix or wish to use files even under Windows
-  #define wxConfig  wxFileConfig
-#endif
-
 #endif // wxUSE_CONFIG
 
 /*
diff --git a/include/wx/config.h b/include/wx/config.h
index 2cd571dae6..ddbbbe2f47 100644
--- a/include/wx/config.h
+++ b/include/wx/config.h
@@ -15,17 +15,24 @@
 #include "wx/defs.h"
 #include "wx/confbase.h"
 
+// ----------------------------------------------------------------------------
+// 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(__WXMSW__) && wxUSE_CONFIG_NATIVE
-#    ifdef __WIN32__
-#        include "wx/msw/regconf.h"
-#    else
-#        include "wx/msw/iniconf.h"
-#    endif
+    #include "wx/msw/regconf.h"
+    #define wxConfig  wxRegConfig
+#elif defined(__WXOS2__) && wxUSE_CONFIG_NATIVE
+    #include "wx/os2/iniconf.h"
+    #define wxConfig wxIniConfig
 #elif defined(__WXPALMOS__) && wxUSE_CONFIG_NATIVE
-#    include "wx/palmos/prefconf.h"
-#else
-#    include "wx/fileconf.h"
+    #include "wx/palmos/prefconf.h"
+    #define wxConfig wxPrefConfig
+#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 // _WX_CONFIG_H_BASE_