X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c9cacf3e495f3aacb919ee1046338a25982db86c..6bc3b8e9680e8aa3d50ae4bb41dad22c6dd3ce1b:/include/wx/confbase.h diff --git a/include/wx/confbase.h b/include/wx/confbase.h index 6ce5b907a4..699a9e0ace 100644 --- a/include/wx/confbase.h +++ b/include/wx/confbase.h @@ -49,8 +49,7 @@ class WXDLLIMPEXP_BASE wxArrayString; /// should we use registry instead of configuration files under Windows? // (i.e. whether wxConfigBase::Create() will create a wxFileConfig (if it's -// FALSE) or wxRegConfig (if it's true and we're under Win32) or wxIniConfig -// (under Win16)) +// FALSE) or wxRegConfig (if it's true and we're under Win32)) #ifndef wxUSE_CONFIG_NATIVE #define wxUSE_CONFIG_NATIVE 1 #endif @@ -320,12 +319,9 @@ private: // ---------------------------------------------------------------------------- // 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 - #ifdef __WIN32__ #define wxConfig wxRegConfig - #else //WIN16 - #define wxConfig wxIniConfig - #endif #else // either we're under Unix or wish to use files even under Windows #define wxConfig wxFileConfig #endif