X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a9decf2374b39789cd8f66b0348fba46ff2915c0..7249080588e30b4740adc138e793ffa0ead4b5ef:/include/wx/chkconf.h diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h index 8b8a8c77b7..3d05c7c85c 100644 --- a/include/wx/chkconf.h +++ b/include/wx/chkconf.h @@ -1273,7 +1273,7 @@ #endif /* wxUSE_HELP */ #if wxUSE_WXHTML_HELP -# if !wxUSE_HELP || !wxUSE_HTML || !wxUSE_COMBOBOX || !wxUSE_NOTEBOOK +# if !wxUSE_HELP || !wxUSE_HTML || !wxUSE_COMBOBOX || !wxUSE_NOTEBOOK || !wxUSE_SPINCTRL # ifdef wxABORT_ON_CONFIG_ERROR # error "Built in help controller can't be compiled" # else @@ -1285,6 +1285,8 @@ # define wxUSE_COMBOBOX 1 # undef wxUSE_NOTEBOOK # define wxUSE_NOTEBOOK 1 +# undef wxUSE_SPINCTRL +# define wxUSE_SPINCTRL 1 # endif # endif #endif /* wxUSE_WXHTML_HELP */ @@ -1458,6 +1460,17 @@ # endif #endif /* wxUSE_FILEDLG */ +#if !wxUSE_GAUGE +# if wxUSE_PROGRESSDLG +# ifdef wxABORT_ON_CONFIG_ERROR +# error "Progress dialog require wxUSE_GAUGE" +# else +# undef wxUSE_GAUGE +# define wxUSE_GAUGE 1 +# endif +# endif +#endif /* !wxUSE_GAUGE */ + #if !wxUSE_BUTTON # if wxUSE_PROGRESSDLG || \ wxUSE_FONTDLG || \ @@ -1475,7 +1488,7 @@ # define wxUSE_BUTTON 1 # endif # endif -#endif /* wxUSE_PROGRESSDLG */ +#endif /* !wxUSE_BUTTON */ #if !wxUSE_TOOLBAR # if wxUSE_TOOLBAR_NATIVE