X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12028905135250524409f1e7b9bfa9c55e5ce16b..d6d6a882d4d8ea0d7ef706a45fa92b96f34c94c7:/include/wx/confbase.h diff --git a/include/wx/confbase.h b/include/wx/confbase.h index 415c770efd..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,17 +319,11 @@ 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 - #define sm_classwxConfig sm_classwxRegConfig - #else //WIN16 - #define wxConfig wxIniConfig - #define sm_classwxConfig sm_classwxIniConfig - #endif #else // either we're under Unix or wish to use files even under Windows #define wxConfig wxFileConfig - #define sm_classwxConfig sm_classwxFileConfig #endif #endif // wxUSE_CONFIG