From: Vadim Zeitlin <vadim@wxwidgets.org> Date: Mon, 23 Jan 2012 11:28:09 +0000 (+0000) Subject: Add check for wxFileCtrl dependency on wxDateTime to wx/chkconf.h. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/8ca4b822b957f847cee03c358f4ed8321294dd6c Add check for wxFileCtrl dependency on wxDateTime to wx/chkconf.h. Enable wxDateTime if it's disabled but wxFileCtrl is enabled as the latter needs the former, at least in the generic version. Closes #12821. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70442 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h index 398206ebd4..08016d0069 100644 --- a/include/wx/chkconf.h +++ b/include/wx/chkconf.h @@ -1751,6 +1751,17 @@ # endif #endif /* wxUSE_CHOICEDLG */ +#if wxUSE_FILECTRL +# if !wxUSE_DATETIME +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxFileCtrl requires wxDateTime" +# else +# undef wxUSE_DATETIME +# define wxUSE_DATETIME 1 +# endif +# endif +#endif /* wxUSE_FILECTRL */ + #if wxUSE_HELP # if !wxUSE_BMPBUTTON # ifdef wxABORT_ON_CONFIG_ERROR