X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/88cc66f72d6531529e60fe46990a8323cd9058bf..b25278d885906c601a53fe4ddb246da2f68f66f9:/include/wx/chkconf.h diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h index fc4612f7ae..5278a6490b 100644 --- a/include/wx/chkconf.h +++ b/include/wx/chkconf.h @@ -57,11 +57,6 @@ global features */ -/* GUI build by default */ -#if !defined(wxUSE_GUI) -# define wxUSE_GUI 1 -#endif /* !defined(wxUSE_GUI) */ - /* If we're compiling without support for threads/exceptions we have to disable the corresponding features. @@ -979,7 +974,15 @@ # else # define wxUSE_RICHMSGDLG 0 # endif -#endif /* !defined(wxUSE_RIBBON) */ +#endif /* !defined(wxUSE_RICHMSGDLG) */ + +#ifndef wxUSE_RICHTOOLTIP +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_RICHTOOLTIP must be defined, please read comment near the top of this file." +# else +# define wxUSE_RICHTOOLTIP 0 +# endif +#endif /* !defined(wxUSE_RICHTOOLTIP) */ #ifndef wxUSE_SASH # ifdef wxABORT_ON_CONFIG_ERROR @@ -1101,6 +1104,14 @@ # endif #endif /* !defined(wxUSE_TEXTCTRL) */ +#ifndef wxUSE_TIMEPICKCTRL +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_TIMEPICKCTRL must be defined, please read comment near the top of this file." +# else +# define wxUSE_TIMEPICKCTRL 0 +# endif +#endif /* !defined(wxUSE_TIMEPICKCTRL) */ + #ifndef wxUSE_TIPWINDOW # ifdef wxABORT_ON_CONFIG_ERROR # error "wxUSE_TIPWINDOW must be defined, please read comment near the top of this file." @@ -1713,16 +1724,16 @@ # endif #endif /* wxUSE_CALENDARCTRL */ -#if wxUSE_DATEPICKCTRL +#if wxUSE_DATEPICKCTRL || wxUSE_TIMEPICKCTRL # if !wxUSE_DATETIME # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxDatePickerCtrl requires wxUSE_DATETIME" +# error "wxDatePickerCtrl and wxTimePickerCtrl requires wxUSE_DATETIME" # else # undef wxUSE_DATETIME # define wxUSE_DATETIME 1 # endif # endif -#endif /* wxUSE_DATEPICKCTRL */ +#endif /* wxUSE_DATEPICKCTRL || wxUSE_TIMEPICKCTRL */ #if wxUSE_CHECKLISTBOX # if !wxUSE_LISTBOX