X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fad4327b0da1cf7860a0e998a24cbf5ab134a683..8e7a3ecb9c1b9f5653e56301f51dfa39acca6bc6:/include/wx/config.h diff --git a/include/wx/config.h b/include/wx/config.h index 74f90300f7..4df4b8dd08 100644 --- a/include/wx/config.h +++ b/include/wx/config.h @@ -1,38 +1,32 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: config.h +// 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/defs.h" +#include "wx/confbase.h" #if wxUSE_CONFIG -#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(__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 -#elif defined(__WXPALMOS__) && wxUSE_CONFIG_NATIVE - #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