X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/05815ab32f501810bf0923a511f7d99b90b808a2..e74563e412a08aa004c5429efed7ef0031c2c1bf:/include/wx/chkconf.h?ds=sidebyside diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h index e11fad03ac..c519fea476 100644 --- a/include/wx/chkconf.h +++ b/include/wx/chkconf.h @@ -12,10 +12,10 @@ /* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */ /* - this global setting determintes what should we do if the setting FOO + this global setting determines what should we do if the setting FOO requires BAR and BAR is not set: we can either silently define BAR (default, recommended) or give an error and abort (mainly useful for - developpers only) + developers only) */ #define wxABORT_ON_CONFIG_ERROR @@ -50,12 +50,17 @@ # endif #endif /* !defined(wxUSE_DYNLIB_CLASS) */ -#ifndef wxUSE_FSVOLUME +#ifndef wxUSE_FILESYSTEM # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_FSVOLUME +# error "wxUSE_FILESYSTEM must be defined." # else -# define wxUSE_FSVOLUME 0 +# define wxUSE_FILESYSTEM 0 # endif +#endif /* !defined(wxUSE_FILESYSTEM) */ + +/* don't give an error about this one yet, it's not fully implemented */ +#ifndef wxUSE_FSVOLUME +# define wxUSE_FSVOLUME 0 #endif /* !defined(wxUSE_FSVOLUME) */ #ifndef wxUSE_DYNAMIC_LOADER @@ -90,6 +95,14 @@ # endif #endif /* !defined(wxUSE_MIMETYPE) */ +#ifndef wxUSE_PROLOGIO +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_PROLOGIO must be defined." +# else +# define wxUSE_PROLOGIO 0 +# endif +#endif /* !defined(wxUSE_PROLOGIO) */ + #ifndef wxUSE_PROTOCOL # ifdef wxABORT_ON_CONFIG_ERROR # error "wxUSE_PROTOCOL must be defined." @@ -670,6 +683,14 @@ # endif #endif /* !defined(wxUSE_TREECTRL) */ +#ifndef wxUSE_WX_RESOURCES +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_WX_RESOURCES must be defined." +# else +# define wxUSE_WX_RESOURCES 0 +# endif +#endif /* !defined(wxUSE_WX_RESOURCES) */ + #ifndef wxUSE_WXHTML_HELP # ifdef wxABORT_ON_CONFIG_ERROR # error "wxUSE_WXHTML_HELP must be defined." @@ -728,11 +749,33 @@ # endif #endif /* wxUSE_PROTOCOL */ -/* non GUI settings */ -#if wxUSE_STOPWATCH +/* have to test for wxUSE_HTML before wxUSE_FILESYSTEM */ +#if wxUSE_HTML +# if !wxUSE_FILESYSTEM +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxHTML requires wxFileSystem" +# else +# undef wxUSE_FILESYSTEM +# define wxUSE_FILESYSTEM 1 +# endif +# endif +#endif /* wxUSE_HTML */ + +#if wxUSE_FILESYSTEM +# if !wxUSE_STREAMS +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_FILESYSTEM requires wxUSE_STREAMS" +# else +# undef wxUSE_STREAMS +# define wxUSE_STREAMS 1 +# endif +# endif +#endif /* wxUSE_FILESYSTEM */ + +#if wxUSE_STOPWATCH || wxUSE_DATETIME # if !wxUSE_LONGLONG # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_STOPWATCH requires wxUSE_LONGLONG" +# error "wxUSE_STOPWATCH and wxUSE_DATETIME require wxUSE_LONGLONG" # else # undef wxUSE_LONGLONG # define wxUSE_LONGLONG 1 @@ -776,6 +819,16 @@ # endif #endif /* wxUSE_UNICODE_MSLU */ +#if wxUSE_ODBC && wxUSE_UNICODE +# ifdef wxABORT_ON_CONFIG_ERROR + /* (ODBC classes aren't Unicode-compatible yet) */ +# error "wxUSE_ODBC can't be used with wxUSE_UNICODE" +# else +# undef wxUSE_ODBC +# define wxUSE_ODBC 0 +# endif +#endif /* wxUSE_ODBC */ + /* the rest of the tests is for the GUI settings only */ #if wxUSE_GUI @@ -948,6 +1001,13 @@ # define wxUSE_TOGGLEBTN 0 #endif +/* wxMGL-specific dependencies */ +#ifdef __WXMGL__ +# if !wxUSE_PALETTE +# error "wxMGL requires wxUSE_PALETTE=1" +# endif +#endif /* wxMGL */ + /* generic controls dependencies */ #if !defined(__WXMSW__) || defined(__WXUNIVERSAL__) # if wxUSE_FONTDLG || wxUSE_FILEDLG || wxUSE_CHOICEDLG @@ -1001,7 +1061,7 @@ #endif /* wxUSE_RADIOBTN */ #if wxUSE_WXHTML_HELP -# if !wxUSE_HELP || !wxUSE_HTML || !wxUSE_COMBOBOX +# if !wxUSE_HELP || !wxUSE_HTML || !wxUSE_COMBOBOX || !wxUSE_NOTEBOOK # ifdef wxABORT_ON_CONFIG_ERROR # error "Built in help controller can't be compiled" # else @@ -1011,10 +1071,32 @@ # define wxUSE_HTML 1 # undef wxUSE_COMBOBOX # define wxUSE_COMBOBOX 1 +# undef wxUSE_NOTEBOOK +# define wxUSE_NOTEBOOK 1 # endif # endif #endif /* wxUSE_WXHTML_HELP */ +#if wxUSE_DOC_VIEW_ARCHITECTURE +# if !wxUSE_MENUS +# ifdef wxABORT_ON_CONFIG_ERROR +# error "DocView requires wxUSE_MENUS" +# else +# undef wxUSE_MENUS +# define wxUSE_MENUS 1 +# endif +# endif + +# if !wxUSE_STREAMS && !wxUSE_STD_IOSTREAM +# ifdef wxABORT_ON_CONFIG_ERROR +# error "DocView requires wxUSE_STREAMS or wxUSE_STD_IOSTREAM" +# else +# undef wxUSE_STREAMS +# define wxUSE_STREAMS 1 +# endif +# endif +#endif /* wxUSE_DOC_VIEW_ARCHITECTURE */ + #if wxUSE_PRINTING_ARCHITECTURE # if !wxUSE_COMBOBOX # ifdef wxABORT_ON_CONFIG_ERROR @@ -1024,18 +1106,27 @@ # define wxUSE_COMBOBOX 1 # endif # endif + +# if !wxUSE_DOC_VIEW_ARCHITECTURE +# ifdef wxABORT_ON_CONFIG_ERROR +# error "Print architecture requires wxUSE_DOC_VIEW_ARCHITECTURE" +# else +# undef wxUSE_DOC_VIEW_ARCHITECTURE +# define wxUSE_DOC_VIEW_ARCHITECTURE 1 +# endif +# endif #endif /* wxUSE_PRINTING_ARCHITECTURE */ -#if wxUSE_DOC_VIEW_ARCHITECTURE -# if !wxUSE_MENUS +#if wxUSE_MDI_ARCHITECTURE +# if !wxUSE_DOC_VIEW_ARCHITECTURE # ifdef wxABORT_ON_CONFIG_ERROR -# error "DocView requires wxUSE_MENUS" +# error "MDI requires wxUSE_DOC_VIEW_ARCHITECTURE" # else -# undef wxUSE_MENUS -# define wxUSE_MENUS 1 +# undef wxUSE_DOC_VIEW_ARCHITECTURE +# define wxUSE_DOC_VIEW_ARCHITECTURE 1 # endif # endif -#endif /* wxUSE_DOC_VIEW_ARCHITECTURE */ +#endif /* wxUSE_MDI_ARCHITECTURE */ #if !wxUSE_FILEDLG # if wxUSE_DOC_VIEW_ARCHITECTURE || wxUSE_WXHTML_HELP @@ -1124,5 +1215,14 @@ # endif #endif /* wxUSE_CLIPBOARD */ +#if wxUSE_WX_RESOURCES && !wxUSE_PROLOGIO +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxr resources require PrologIO" +# else +# undef wxUSE_PROLOGIO +# define wxUSE_PROLOGIO 1 +# endif +#endif /* wxUSE_WX_RESOURCES */ + #endif /* wxUSE_GUI */