Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52232 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-03-02 01:14:16 +00:00
parent abd0503cf7
commit f0d3a2cc93
2 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/wx/confbase.h
View File

@@ -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 #endif // wxUSE_CONFIG
/* /*

27
include/wx/config.h
View File

@@ -15,17 +15,24 @@
#include "wx/defs.h" #include "wx/defs.h"
#include "wx/confbase.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 #if defined(__WXMSW__) && wxUSE_CONFIG_NATIVE
# ifdef __WIN32__ #include "wx/msw/regconf.h"
# include "wx/msw/regconf.h" #define wxConfig wxRegConfig
# else #elif defined(__WXOS2__) && wxUSE_CONFIG_NATIVE
# include "wx/msw/iniconf.h" #include "wx/os2/iniconf.h"
# endif #define wxConfig wxIniConfig
#elif defined(__WXPALMOS__) && wxUSE_CONFIG_NATIVE #elif defined(__WXPALMOS__) && wxUSE_CONFIG_NATIVE
# include "wx/palmos/prefconf.h" #include "wx/palmos/prefconf.h"
#else #define wxConfig wxPrefConfig
# include "wx/fileconf.h" #else // either we're under Unix or wish to always use config files
#include "wx/fileconf.h"
#define wxConfig wxFileConfig
#endif #endif
#endif #endif // _WX_CONFIG_H_BASE_
// _WX_CONFIG_H_BASE_