X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a92b5dfe8ce92f1686df0bec0ccc61d75ed46100..11e3c6ef36393fb5863ea2f9601d8facd73acb12:/include/wx/chkconf.h?ds=inline diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h index 29868206a8..ad5744acaf 100644 --- a/include/wx/chkconf.h +++ b/include/wx/chkconf.h @@ -13,6 +13,27 @@ #ifndef _WX_CHKCONF_H_ #define _WX_CHKCONF_H_ +/* + ************************************************** + PLEASE READ THIS IF YOU GET AN ERROR IN THIS FILE! + ************************************************** + + If you get an error saying "wxUSE_FOO must be defined", it means that you + are not using the correct up-to-date version of setup.h. This happens most + often when using svn or daily snapshots and a new symbol was added to + setup0.h and you haven't updated your local setup.h to reflect it. If + this is the case, you need to propagate the changes from setup0.h to your + setup.h and, if using makefiles under MSW, also remove setup.h under the + build directory (lib/$(COMPILER)_{lib,dll}/msw[u][d][dll]/wx) so that + the new setup.h is copied there. + + If you get an error of the form "wxFoo requires wxBar", then the settings + in your setup.h are inconsistent. You have the choice between correcting + them manually or commenting out #define wxABORT_ON_CONFIG_ERROR below to + try to correct the problems automatically (not really recommended but + might work). + */ + /* This file has the following sections: 1. checks that all wxUSE_XXX symbols we use are defined @@ -28,7 +49,7 @@ this global setting determines what should we do if the setting FOO requires BAR and BAR is not set: we can either silently unset FOO as well (do this if you're trying to build the smallest possible library) or give an - error and abort (default as leads to least surprizing behaviour) + error and abort (default as leads to least surprising behaviour) */ #define wxABORT_ON_CONFIG_ERROR @@ -36,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. @@ -70,15 +86,23 @@ #ifndef wxUSE_ANY # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_ANY must be defined." +# error "wxUSE_ANY must be defined, please read comment near the top of this file." # else # define wxUSE_ANY 0 # endif #endif /* wxUSE_ANY */ +#ifndef wxUSE_COMPILER_TLS +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_COMPILER_TLS must be defined, please read comment near the top of this file." +# else +# define wxUSE_COMPILER_TLS 0 +# endif +#endif /* !defined(wxUSE_COMPILER_TLS) */ + #ifndef wxUSE_CONSOLE_EVENTLOOP # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_CONSOLE_EVENTLOOP must be defined." +# error "wxUSE_CONSOLE_EVENTLOOP must be defined, please read comment near the top of this file." # else # define wxUSE_CONSOLE_EVENTLOOP 0 # endif @@ -86,7 +110,7 @@ #ifndef wxUSE_DYNLIB_CLASS # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_DYNLIB_CLASS must be defined." +# error "wxUSE_DYNLIB_CLASS must be defined, please read comment near the top of this file." # else # define wxUSE_DYNLIB_CLASS 0 # endif @@ -94,15 +118,23 @@ #ifndef wxUSE_EXCEPTIONS # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_EXCEPTIONS must be defined." +# error "wxUSE_EXCEPTIONS must be defined, please read comment near the top of this file." # else # define wxUSE_EXCEPTIONS 0 # endif #endif /* !defined(wxUSE_EXCEPTIONS) */ +#ifndef wxUSE_FILE_HISTORY +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_FILE_HISTORY must be defined, please read comment near the top of this file." +# else +# define wxUSE_FILE_HISTORY 0 +# endif +#endif /* !defined(wxUSE_FILE_HISTORY) */ + #ifndef wxUSE_FILESYSTEM # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_FILESYSTEM must be defined." +# error "wxUSE_FILESYSTEM must be defined, please read comment near the top of this file." # else # define wxUSE_FILESYSTEM 0 # endif @@ -110,7 +142,7 @@ #ifndef wxUSE_FS_ARCHIVE # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_FS_ARCHIVE must be defined." +# error "wxUSE_FS_ARCHIVE must be defined, please read comment near the top of this file." # else # define wxUSE_FS_ARCHIVE 0 # endif @@ -118,15 +150,23 @@ #ifndef wxUSE_FSVOLUME # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_FSVOLUME must be defined." +# error "wxUSE_FSVOLUME must be defined, please read comment near the top of this file." # else # define wxUSE_FSVOLUME 0 # endif #endif /* !defined(wxUSE_FSVOLUME) */ +#ifndef wxUSE_FSWATCHER +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_FSWATCHER must be defined, please read comment near the top of this file." +# else +# define wxUSE_FSWATCHER 0 +# endif +#endif /* !defined(wxUSE_FSWATCHER) */ + #ifndef wxUSE_DYNAMIC_LOADER # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_DYNAMIC_LOADER must be defined." +# error "wxUSE_DYNAMIC_LOADER must be defined, please read comment near the top of this file." # else # define wxUSE_DYNAMIC_LOADER 0 # endif @@ -134,7 +174,7 @@ #ifndef wxUSE_INTL # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_INTL must be defined." +# error "wxUSE_INTL must be defined, please read comment near the top of this file." # else # define wxUSE_INTL 0 # endif @@ -142,7 +182,7 @@ #ifndef wxUSE_IPV6 # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_IPV6 must be defined." +# error "wxUSE_IPV6 must be defined, please read comment near the top of this file." # else # define wxUSE_IPV6 0 # endif @@ -150,7 +190,7 @@ #ifndef wxUSE_LOG # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_LOG must be defined." +# error "wxUSE_LOG must be defined, please read comment near the top of this file." # else # define wxUSE_LOG 0 # endif @@ -158,7 +198,7 @@ #ifndef wxUSE_LONGLONG # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_LONGLONG must be defined." +# error "wxUSE_LONGLONG must be defined, please read comment near the top of this file." # else # define wxUSE_LONGLONG 0 # endif @@ -166,7 +206,7 @@ #ifndef wxUSE_MIMETYPE # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_MIMETYPE must be defined." +# error "wxUSE_MIMETYPE must be defined, please read comment near the top of this file." # else # define wxUSE_MIMETYPE 0 # endif @@ -174,7 +214,7 @@ #ifndef wxUSE_ON_FATAL_EXCEPTION # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_ON_FATAL_EXCEPTION must be defined." +# error "wxUSE_ON_FATAL_EXCEPTION must be defined, please read comment near the top of this file." # else # define wxUSE_ON_FATAL_EXCEPTION 0 # endif @@ -182,7 +222,7 @@ #ifndef wxUSE_PRINTF_POS_PARAMS # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_PRINTF_POS_PARAMS must be defined." +# error "wxUSE_PRINTF_POS_PARAMS must be defined, please read comment near the top of this file." # else # define wxUSE_PRINTF_POS_PARAMS 0 # endif @@ -190,7 +230,7 @@ #ifndef wxUSE_PROTOCOL # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_PROTOCOL must be defined." +# error "wxUSE_PROTOCOL must be defined, please read comment near the top of this file." # else # define wxUSE_PROTOCOL 0 # endif @@ -208,7 +248,7 @@ #ifndef wxUSE_PROTOCOL_HTTP # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_PROTOCOL_HTTP must be defined." +# error "wxUSE_PROTOCOL_HTTP must be defined, please read comment near the top of this file." # else # define wxUSE_PROTOCOL_HTTP 0 # endif @@ -216,7 +256,7 @@ #ifndef wxUSE_PROTOCOL_FTP # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_PROTOCOL_FTP must be defined." +# error "wxUSE_PROTOCOL_FTP must be defined, please read comment near the top of this file." # else # define wxUSE_PROTOCOL_FTP 0 # endif @@ -224,7 +264,7 @@ #ifndef wxUSE_PROTOCOL_FILE # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_PROTOCOL_FILE must be defined." +# error "wxUSE_PROTOCOL_FILE must be defined, please read comment near the top of this file." # else # define wxUSE_PROTOCOL_FILE 0 # endif @@ -232,7 +272,7 @@ #ifndef wxUSE_REGEX # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_REGEX must be defined." +# error "wxUSE_REGEX must be defined, please read comment near the top of this file." # else # define wxUSE_REGEX 0 # endif @@ -240,7 +280,7 @@ #ifndef wxUSE_STDPATHS # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_STDPATHS must be defined." +# error "wxUSE_STDPATHS must be defined, please read comment near the top of this file." # else # define wxUSE_STDPATHS 1 # endif @@ -248,7 +288,7 @@ #ifndef wxUSE_XML # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_XML must be defined." +# error "wxUSE_XML must be defined, please read comment near the top of this file." # else # define wxUSE_XML 0 # endif @@ -256,15 +296,31 @@ #ifndef wxUSE_SOCKETS # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_SOCKETS must be defined." +# error "wxUSE_SOCKETS must be defined, please read comment near the top of this file." # else # define wxUSE_SOCKETS 0 # endif #endif /* !defined(wxUSE_SOCKETS) */ +#ifndef wxUSE_STD_CONTAINERS +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_STD_CONTAINERS must be defined, please read comment near the top of this file." +# else +# define wxUSE_STD_CONTAINERS 0 +# endif +#endif /* !defined(wxUSE_STD_CONTAINERS) */ + +#ifndef wxUSE_STD_STRING_CONV_IN_WXSTRING +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_STD_STRING_CONV_IN_WXSTRING must be defined, please read comment near the top of this file." +# else +# define wxUSE_STD_STRING_CONV_IN_WXSTRING 0 +# endif +#endif /* !defined(wxUSE_STD_STRING_CONV_IN_WXSTRING) */ + #ifndef wxUSE_STREAMS # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_STREAMS must be defined." +# error "wxUSE_STREAMS must be defined, please read comment near the top of this file." # else # define wxUSE_STREAMS 0 # endif @@ -272,7 +328,7 @@ #ifndef wxUSE_STOPWATCH # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_STOPWATCH must be defined." +# error "wxUSE_STOPWATCH must be defined, please read comment near the top of this file." # else # define wxUSE_STOPWATCH 0 # endif @@ -280,7 +336,7 @@ #ifndef wxUSE_TEXTBUFFER # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_TEXTBUFFER must be defined." +# error "wxUSE_TEXTBUFFER must be defined, please read comment near the top of this file." # else # define wxUSE_TEXTBUFFER 0 # endif @@ -288,7 +344,7 @@ #ifndef wxUSE_TEXTFILE # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_TEXTFILE must be defined." +# error "wxUSE_TEXTFILE must be defined, please read comment near the top of this file." # else # define wxUSE_TEXTFILE 0 # endif @@ -296,7 +352,7 @@ #ifndef wxUSE_UNICODE # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_UNICODE must be defined." +# error "wxUSE_UNICODE must be defined, please read comment near the top of this file." # else # define wxUSE_UNICODE 0 # endif @@ -304,7 +360,7 @@ #ifndef wxUSE_URL # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_URL must be defined." +# error "wxUSE_URL must be defined, please read comment near the top of this file." # else # define wxUSE_URL 0 # endif @@ -312,7 +368,7 @@ #ifndef wxUSE_VARIANT # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_VARIANT must be defined." +# error "wxUSE_VARIANT must be defined, please read comment near the top of this file." # else # define wxUSE_VARIANT 0 # endif @@ -320,7 +376,7 @@ #ifndef wxUSE_XLOCALE # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_XLOCALE must be defined." +# error "wxUSE_XLOCALE must be defined, please read comment near the top of this file." # else # define wxUSE_XLOCALE 0 # endif @@ -340,7 +396,7 @@ #ifndef wxUSE_ABOUTDLG # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_ABOUTDLG must be defined." +# error "wxUSE_ABOUTDLG must be defined, please read comment near the top of this file." # else # define wxUSE_ABOUTDLG 0 # endif @@ -348,7 +404,7 @@ #ifndef wxUSE_ACCEL # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_ACCEL must be defined." +# error "wxUSE_ACCEL must be defined, please read comment near the top of this file." # else # define wxUSE_ACCEL 0 # endif @@ -356,7 +412,7 @@ #ifndef wxUSE_ACCESSIBILITY # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_ACCESSIBILITY must be defined." +# error "wxUSE_ACCESSIBILITY must be defined, please read comment near the top of this file." # else # define wxUSE_ACCESSIBILITY 0 # endif @@ -364,15 +420,31 @@ #ifndef wxUSE_ANIMATIONCTRL # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_ANIMATIONCTRL must be defined." +# error "wxUSE_ANIMATIONCTRL must be defined, please read comment near the top of this file." # else # define wxUSE_ANIMATIONCTRL 0 # endif #endif /* !defined(wxUSE_ANIMATIONCTRL) */ +#ifndef wxUSE_ARTPROVIDER_STD +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_ARTPROVIDER_STD must be defined, please read comment near the top of this file." +# else +# define wxUSE_ARTPROVIDER_STD 0 +# endif +#endif /* !defined(wxUSE_ARTPROVIDER_STD) */ + +#ifndef wxUSE_ARTPROVIDER_TANGO +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_ARTPROVIDER_TANGO must be defined, please read comment near the top of this file." +# else +# define wxUSE_ARTPROVIDER_TANGO 0 +# endif +#endif /* !defined(wxUSE_ARTPROVIDER_TANGO) */ + #ifndef wxUSE_AUTOID_MANAGEMENT # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_AUTOID_MANAGEMENT must be defined." +# error "wxUSE_AUTOID_MANAGEMENT must be defined, please read comment near the top of this file." # else # define wxUSE_AUTOID_MANAGEMENT 0 # endif @@ -380,7 +452,7 @@ #ifndef wxUSE_BITMAPCOMBOBOX # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_BITMAPCOMBOBOX must be defined." +# error "wxUSE_BITMAPCOMBOBOX must be defined, please read comment near the top of this file." # else # define wxUSE_BITMAPCOMBOBOX 0 # endif @@ -388,7 +460,7 @@ #ifndef wxUSE_BMPBUTTON # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_BMPBUTTON must be defined." +# error "wxUSE_BMPBUTTON must be defined, please read comment near the top of this file." # else # define wxUSE_BMPBUTTON 0 # endif @@ -396,15 +468,23 @@ #ifndef wxUSE_BUTTON # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_BUTTON must be defined." +# error "wxUSE_BUTTON must be defined, please read comment near the top of this file." # else # define wxUSE_BUTTON 0 # endif #endif /* !defined(wxUSE_BUTTON) */ +#ifndef wxUSE_CAIRO +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_CAIRO must be defined, please read comment near the top of this file." +# else +# define wxUSE_CAIRO 0 +# endif +#endif /* !defined(wxUSE_CAIRO) */ + #ifndef wxUSE_CALENDARCTRL # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_CALENDARCTRL must be defined." +# error "wxUSE_CALENDARCTRL must be defined, please read comment near the top of this file." # else # define wxUSE_CALENDARCTRL 0 # endif @@ -412,7 +492,7 @@ #ifndef wxUSE_CARET # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_CARET must be defined." +# error "wxUSE_CARET must be defined, please read comment near the top of this file." # else # define wxUSE_CARET 0 # endif @@ -420,7 +500,7 @@ #ifndef wxUSE_CHECKBOX # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_CHECKBOX must be defined." +# error "wxUSE_CHECKBOX must be defined, please read comment near the top of this file." # else # define wxUSE_CHECKBOX 0 # endif @@ -428,7 +508,7 @@ #ifndef wxUSE_CHECKLISTBOX # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_CHECKLISTBOX must be defined." +# error "wxUSE_CHECKLISTBOX must be defined, please read comment near the top of this file." # else # define wxUSE_CHECKLISTBOX 0 # endif @@ -436,7 +516,7 @@ #ifndef wxUSE_CHOICE # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_CHOICE must be defined." +# error "wxUSE_CHOICE must be defined, please read comment near the top of this file." # else # define wxUSE_CHOICE 0 # endif @@ -444,7 +524,7 @@ #ifndef wxUSE_CHOICEBOOK # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_CHOICEBOOK must be defined." +# error "wxUSE_CHOICEBOOK must be defined, please read comment near the top of this file." # else # define wxUSE_CHOICEBOOK 0 # endif @@ -452,7 +532,7 @@ #ifndef wxUSE_CHOICEDLG # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_CHOICEDLG must be defined." +# error "wxUSE_CHOICEDLG must be defined, please read comment near the top of this file." # else # define wxUSE_CHOICEDLG 0 # endif @@ -460,7 +540,7 @@ #ifndef wxUSE_CLIPBOARD # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_CLIPBOARD must be defined." +# error "wxUSE_CLIPBOARD must be defined, please read comment near the top of this file." # else # define wxUSE_CLIPBOARD 0 # endif @@ -468,7 +548,7 @@ #ifndef wxUSE_COLLPANE # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_COLLPANE must be defined." +# error "wxUSE_COLLPANE must be defined, please read comment near the top of this file." # else # define wxUSE_COLLPANE 0 # endif @@ -476,7 +556,7 @@ #ifndef wxUSE_COLOURDLG # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_COLOURDLG must be defined." +# error "wxUSE_COLOURDLG must be defined, please read comment near the top of this file." # else # define wxUSE_COLOURDLG 0 # endif @@ -484,7 +564,7 @@ #ifndef wxUSE_COLOURPICKERCTRL # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_COLOURPICKERCTRL must be defined." +# error "wxUSE_COLOURPICKERCTRL must be defined, please read comment near the top of this file." # else # define wxUSE_COLOURPICKERCTRL 0 # endif @@ -492,15 +572,23 @@ #ifndef wxUSE_COMBOBOX # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_COMBOBOX must be defined." +# error "wxUSE_COMBOBOX must be defined, please read comment near the top of this file." # else # define wxUSE_COMBOBOX 0 # endif #endif /* !defined(wxUSE_COMBOBOX) */ +#ifndef wxUSE_COMMANDLINKBUTTON +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_COMMANDLINKBUTTON must be defined, please read comment near the top of this file." +# else +# define wxUSE_COMMANDLINKBUTTON 0 +# endif +#endif /* !defined(wxUSE_COMMANDLINKBUTTON) */ + #ifndef wxUSE_COMBOCTRL # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_COMBOCTRL must be defined." +# error "wxUSE_COMBOCTRL must be defined, please read comment near the top of this file." # else # define wxUSE_COMBOCTRL 0 # endif @@ -508,7 +596,7 @@ #ifndef wxUSE_DATAOBJ # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_DATAOBJ must be defined." +# error "wxUSE_DATAOBJ must be defined, please read comment near the top of this file." # else # define wxUSE_DATAOBJ 0 # endif @@ -516,7 +604,7 @@ #ifndef wxUSE_DATAVIEWCTRL # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_DATAVIEWCTRL must be defined." +# error "wxUSE_DATAVIEWCTRL must be defined, please read comment near the top of this file." # else # define wxUSE_DATAVIEWCTRL 0 # endif @@ -524,15 +612,23 @@ #ifndef wxUSE_DATEPICKCTRL # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_DATEPICKCTRL must be defined." +# error "wxUSE_DATEPICKCTRL must be defined, please read comment near the top of this file." # else # define wxUSE_DATEPICKCTRL 0 # endif #endif /* !defined(wxUSE_DATEPICKCTRL) */ +#ifndef wxUSE_DC_TRANSFORM_MATRIX +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_DC_TRANSFORM_MATRIX must be defined, please read comment near the top of this file." +# else +# define wxUSE_DC_TRANSFORM_MATRIX 1 +# endif +#endif /* wxUSE_DC_TRANSFORM_MATRIX */ + #ifndef wxUSE_DIRPICKERCTRL # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_DIRPICKERCTRL must be defined." +# error "wxUSE_DIRPICKERCTRL must be defined, please read comment near the top of this file." # else # define wxUSE_DIRPICKERCTRL 0 # endif @@ -540,7 +636,7 @@ #ifndef wxUSE_DISPLAY # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_DISPLAY must be defined." +# error "wxUSE_DISPLAY must be defined, please read comment near the top of this file." # else # define wxUSE_DISPLAY 0 # endif @@ -548,7 +644,7 @@ #ifndef wxUSE_DOC_VIEW_ARCHITECTURE # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_DOC_VIEW_ARCHITECTURE must be defined." +# error "wxUSE_DOC_VIEW_ARCHITECTURE must be defined, please read comment near the top of this file." # else # define wxUSE_DOC_VIEW_ARCHITECTURE 0 # endif @@ -556,7 +652,7 @@ #ifndef wxUSE_FILECTRL # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_FILECTRL must be defined." +# error "wxUSE_FILECTRL must be defined, please read comment near the top of this file." # else # define wxUSE_FILECTRL 0 # endif @@ -564,7 +660,7 @@ #ifndef wxUSE_FILEDLG # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_FILEDLG must be defined." +# error "wxUSE_FILEDLG must be defined, please read comment near the top of this file." # else # define wxUSE_FILEDLG 0 # endif @@ -572,7 +668,7 @@ #ifndef wxUSE_FILEPICKERCTRL # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_FILEPICKERCTRL must be defined." +# error "wxUSE_FILEPICKERCTRL must be defined, please read comment near the top of this file." # else # define wxUSE_FILEPICKERCTRL 0 # endif @@ -580,7 +676,7 @@ #ifndef wxUSE_FONTDLG # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_FONTDLG must be defined." +# error "wxUSE_FONTDLG must be defined, please read comment near the top of this file." # else # define wxUSE_FONTDLG 0 # endif @@ -588,7 +684,7 @@ #ifndef wxUSE_FONTMAP # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_FONTMAP must be defined." +# error "wxUSE_FONTMAP must be defined, please read comment near the top of this file." # else # define wxUSE_FONTMAP 0 # endif @@ -596,7 +692,7 @@ #ifndef wxUSE_FONTPICKERCTRL # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_FONTPICKERCTRL must be defined." +# error "wxUSE_FONTPICKERCTRL must be defined, please read comment near the top of this file." # else # define wxUSE_FONTPICKERCTRL 0 # endif @@ -604,7 +700,7 @@ #ifndef wxUSE_GAUGE # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_GAUGE must be defined." +# error "wxUSE_GAUGE must be defined, please read comment near the top of this file." # else # define wxUSE_GAUGE 0 # endif @@ -612,7 +708,7 @@ #ifndef wxUSE_GRAPHICS_CONTEXT # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_GRAPHICS_CONTEXT must be defined." +# error "wxUSE_GRAPHICS_CONTEXT must be defined, please read comment near the top of this file." # else # define wxUSE_GRAPHICS_CONTEXT 0 # endif @@ -621,7 +717,7 @@ #ifndef wxUSE_GRID # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_GRID must be defined." +# error "wxUSE_GRID must be defined, please read comment near the top of this file." # else # define wxUSE_GRID 0 # endif @@ -629,7 +725,7 @@ #ifndef wxUSE_HEADERCTRL # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_HEADERCTRL must be defined." +# error "wxUSE_HEADERCTRL must be defined, please read comment near the top of this file." # else # define wxUSE_HEADERCTRL 0 # endif @@ -637,7 +733,7 @@ #ifndef wxUSE_HELP # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_HELP must be defined." +# error "wxUSE_HELP must be defined, please read comment near the top of this file." # else # define wxUSE_HELP 0 # endif @@ -645,7 +741,7 @@ #ifndef wxUSE_HYPERLINKCTRL # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_HYPERLINKCTRL must be defined." +# error "wxUSE_HYPERLINKCTRL must be defined, please read comment near the top of this file." # else # define wxUSE_HYPERLINKCTRL 0 # endif @@ -653,19 +749,19 @@ #ifndef wxUSE_HTML # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_HTML must be defined." +# error "wxUSE_HTML must be defined, please read comment near the top of this file." # else # define wxUSE_HTML 0 # endif #endif /* !defined(wxUSE_HTML) */ #ifndef wxUSE_LIBMSPACK -# if !defined(__UNIX__) || defined(__WXPALMOS__) +# if !defined(__UNIX__) /* set to 0 on platforms that don't have libmspack */ # define wxUSE_LIBMSPACK 0 # else # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_LIBMSPACK must be defined." +# error "wxUSE_LIBMSPACK must be defined, please read comment near the top of this file." # else # define wxUSE_LIBMSPACK 0 # endif @@ -674,7 +770,7 @@ #ifndef wxUSE_ICO_CUR # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_ICO_CUR must be defined." +# error "wxUSE_ICO_CUR must be defined, please read comment near the top of this file." # else # define wxUSE_ICO_CUR 0 # endif @@ -682,7 +778,7 @@ #ifndef wxUSE_IFF # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_IFF must be defined." +# error "wxUSE_IFF must be defined, please read comment near the top of this file." # else # define wxUSE_IFF 0 # endif @@ -690,7 +786,7 @@ #ifndef wxUSE_IMAGLIST # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_IMAGLIST must be defined." +# error "wxUSE_IMAGLIST must be defined, please read comment near the top of this file." # else # define wxUSE_IMAGLIST 0 # endif @@ -698,7 +794,7 @@ #ifndef wxUSE_INFOBAR # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_INFOBAR must be defined." +# error "wxUSE_INFOBAR must be defined, please read comment near the top of this file." # else # define wxUSE_INFOBAR 0 # endif @@ -706,7 +802,7 @@ #ifndef wxUSE_JOYSTICK # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_JOYSTICK must be defined." +# error "wxUSE_JOYSTICK must be defined, please read comment near the top of this file." # else # define wxUSE_JOYSTICK 0 # endif @@ -714,7 +810,7 @@ #ifndef wxUSE_LISTBOOK # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_LISTBOOK must be defined." +# error "wxUSE_LISTBOOK must be defined, please read comment near the top of this file." # else # define wxUSE_LISTBOOK 0 # endif @@ -722,7 +818,7 @@ #ifndef wxUSE_LISTBOX # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_LISTBOX must be defined." +# error "wxUSE_LISTBOX must be defined, please read comment near the top of this file." # else # define wxUSE_LISTBOX 0 # endif @@ -730,7 +826,7 @@ #ifndef wxUSE_LISTCTRL # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_LISTCTRL must be defined." +# error "wxUSE_LISTCTRL must be defined, please read comment near the top of this file." # else # define wxUSE_LISTCTRL 0 # endif @@ -738,7 +834,7 @@ #ifndef wxUSE_LOGGUI # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_LOGGUI must be defined." +# error "wxUSE_LOGGUI must be defined, please read comment near the top of this file." # else # define wxUSE_LOGGUI 0 # endif @@ -746,7 +842,7 @@ #ifndef wxUSE_LOGWINDOW # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_LOGWINDOW must be defined." +# error "wxUSE_LOGWINDOW must be defined, please read comment near the top of this file." # else # define wxUSE_LOGWINDOW 0 # endif @@ -754,15 +850,23 @@ #ifndef wxUSE_LOG_DIALOG # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_LOG_DIALOG must be defined." +# error "wxUSE_LOG_DIALOG must be defined, please read comment near the top of this file." # else # define wxUSE_LOG_DIALOG 0 # endif #endif /* !defined(wxUSE_LOG_DIALOG) */ +#ifndef wxUSE_MARKUP +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_MARKUP must be defined, please read comment near the top of this file." +# else +# define wxUSE_MARKUP 0 +# endif +#endif /* !defined(wxUSE_MARKUP) */ + #ifndef wxUSE_MDI # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_MDI must be defined." +# error "wxUSE_MDI must be defined, please read comment near the top of this file." # else # define wxUSE_MDI 0 # endif @@ -770,7 +874,7 @@ #ifndef wxUSE_MDI_ARCHITECTURE # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_MDI_ARCHITECTURE must be defined." +# error "wxUSE_MDI_ARCHITECTURE must be defined, please read comment near the top of this file." # else # define wxUSE_MDI_ARCHITECTURE 0 # endif @@ -778,7 +882,7 @@ #ifndef wxUSE_MENUS # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_MENUS must be defined." +# error "wxUSE_MENUS must be defined, please read comment near the top of this file." # else # define wxUSE_MENUS 0 # endif @@ -786,7 +890,7 @@ #ifndef wxUSE_MSGDLG # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_MSGDLG must be defined." +# error "wxUSE_MSGDLG must be defined, please read comment near the top of this file." # else # define wxUSE_MSGDLG 0 # endif @@ -794,7 +898,7 @@ #ifndef wxUSE_NOTEBOOK # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_NOTEBOOK must be defined." +# error "wxUSE_NOTEBOOK must be defined, please read comment near the top of this file." # else # define wxUSE_NOTEBOOK 0 # endif @@ -802,7 +906,7 @@ #ifndef wxUSE_NOTIFICATION_MESSAGE # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_NOTIFICATION_MESSAGE must be defined." +# error "wxUSE_NOTIFICATION_MESSAGE must be defined, please read comment near the top of this file." # else # define wxUSE_NOTIFICATION_MESSAGE 0 # endif @@ -810,7 +914,7 @@ #ifndef wxUSE_ODCOMBOBOX # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_ODCOMBOBOX must be defined." +# error "wxUSE_ODCOMBOBOX must be defined, please read comment near the top of this file." # else # define wxUSE_ODCOMBOBOX 0 # endif @@ -818,7 +922,7 @@ #ifndef wxUSE_PALETTE # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_PALETTE must be defined." +# error "wxUSE_PALETTE must be defined, please read comment near the top of this file." # else # define wxUSE_PALETTE 0 # endif @@ -826,7 +930,7 @@ #ifndef wxUSE_POPUPWIN # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_POPUPWIN must be defined." +# error "wxUSE_POPUPWIN must be defined, please read comment near the top of this file." # else # define wxUSE_POPUPWIN 0 # endif @@ -834,7 +938,7 @@ #ifndef wxUSE_PRINTING_ARCHITECTURE # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_PRINTING_ARCHITECTURE must be defined." +# error "wxUSE_PRINTING_ARCHITECTURE must be defined, please read comment near the top of this file." # else # define wxUSE_PRINTING_ARCHITECTURE 0 # endif @@ -842,7 +946,7 @@ #ifndef wxUSE_RADIOBOX # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_RADIOBOX must be defined." +# error "wxUSE_RADIOBOX must be defined, please read comment near the top of this file." # else # define wxUSE_RADIOBOX 0 # endif @@ -850,7 +954,7 @@ #ifndef wxUSE_RADIOBTN # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_RADIOBTN must be defined." +# error "wxUSE_RADIOBTN must be defined, please read comment near the top of this file." # else # define wxUSE_RADIOBTN 0 # endif @@ -858,7 +962,7 @@ #ifndef wxUSE_REARRANGECTRL # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_REARRANGECTRL must be defined." +# error "wxUSE_REARRANGECTRL must be defined, please read comment near the top of this file." # else # define wxUSE_REARRANGECTRL 0 # endif @@ -866,15 +970,31 @@ #ifndef wxUSE_RIBBON # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_RIBBON must be defined." +# error "wxUSE_RIBBON must be defined, please read comment near the top of this file." # else # define wxUSE_RIBBON 0 # endif #endif /* !defined(wxUSE_RIBBON) */ +#ifndef wxUSE_RICHMSGDLG +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_RICHMSGDLG must be defined, please read comment near the top of this file." +# else +# define wxUSE_RICHMSGDLG 0 +# endif +#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 -# error "wxUSE_SASH must be defined." +# error "wxUSE_SASH must be defined, please read comment near the top of this file." # else # define wxUSE_SASH 0 # endif @@ -882,7 +1002,7 @@ #ifndef wxUSE_SCROLLBAR # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_SCROLLBAR must be defined." +# error "wxUSE_SCROLLBAR must be defined, please read comment near the top of this file." # else # define wxUSE_SCROLLBAR 0 # endif @@ -890,7 +1010,7 @@ #ifndef wxUSE_SLIDER # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_SLIDER must be defined." +# error "wxUSE_SLIDER must be defined, please read comment near the top of this file." # else # define wxUSE_SLIDER 0 # endif @@ -898,7 +1018,7 @@ #ifndef wxUSE_SOUND # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_SOUND must be defined." +# error "wxUSE_SOUND must be defined, please read comment near the top of this file." # else # define wxUSE_SOUND 0 # endif @@ -906,7 +1026,7 @@ #ifndef wxUSE_SPINBTN # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_SPINBTN must be defined." +# error "wxUSE_SPINBTN must be defined, please read comment near the top of this file." # else # define wxUSE_SPINBTN 0 # endif @@ -914,7 +1034,7 @@ #ifndef wxUSE_SPINCTRL # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_SPINCTRL must be defined." +# error "wxUSE_SPINCTRL must be defined, please read comment near the top of this file." # else # define wxUSE_SPINCTRL 0 # endif @@ -922,7 +1042,7 @@ #ifndef wxUSE_SPLASH # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_SPLASH must be defined." +# error "wxUSE_SPLASH must be defined, please read comment near the top of this file." # else # define wxUSE_SPLASH 0 # endif @@ -930,7 +1050,7 @@ #ifndef wxUSE_SPLITTER # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_SPLITTER must be defined." +# error "wxUSE_SPLITTER must be defined, please read comment near the top of this file." # else # define wxUSE_SPLITTER 0 # endif @@ -938,7 +1058,7 @@ #ifndef wxUSE_STATBMP # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_STATBMP must be defined." +# error "wxUSE_STATBMP must be defined, please read comment near the top of this file." # else # define wxUSE_STATBMP 0 # endif @@ -946,7 +1066,7 @@ #ifndef wxUSE_STATBOX # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_STATBOX must be defined." +# error "wxUSE_STATBOX must be defined, please read comment near the top of this file." # else # define wxUSE_STATBOX 0 # endif @@ -954,7 +1074,7 @@ #ifndef wxUSE_STATLINE # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_STATLINE must be defined." +# error "wxUSE_STATLINE must be defined, please read comment near the top of this file." # else # define wxUSE_STATLINE 0 # endif @@ -962,7 +1082,7 @@ #ifndef wxUSE_STATTEXT # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_STATTEXT must be defined." +# error "wxUSE_STATTEXT must be defined, please read comment near the top of this file." # else # define wxUSE_STATTEXT 0 # endif @@ -970,7 +1090,7 @@ #ifndef wxUSE_STATUSBAR # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_STATUSBAR must be defined." +# error "wxUSE_STATUSBAR must be defined, please read comment near the top of this file." # else # define wxUSE_STATUSBAR 0 # endif @@ -978,7 +1098,7 @@ #ifndef wxUSE_TASKBARICON # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_TASKBARICON must be defined." +# error "wxUSE_TASKBARICON must be defined, please read comment near the top of this file." # else # define wxUSE_TASKBARICON 0 # endif @@ -986,15 +1106,23 @@ #ifndef wxUSE_TEXTCTRL # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_TEXTCTRL must be defined." +# error "wxUSE_TEXTCTRL must be defined, please read comment near the top of this file." # else # define wxUSE_TEXTCTRL 0 # 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." +# error "wxUSE_TIPWINDOW must be defined, please read comment near the top of this file." # else # define wxUSE_TIPWINDOW 0 # endif @@ -1002,7 +1130,7 @@ #ifndef wxUSE_TOOLBAR # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_TOOLBAR must be defined." +# error "wxUSE_TOOLBAR must be defined, please read comment near the top of this file." # else # define wxUSE_TOOLBAR 0 # endif @@ -1010,7 +1138,7 @@ #ifndef wxUSE_TOOLTIPS # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_TOOLTIPS must be defined." +# error "wxUSE_TOOLTIPS must be defined, please read comment near the top of this file." # else # define wxUSE_TOOLTIPS 0 # endif @@ -1018,23 +1146,47 @@ #ifndef wxUSE_TREECTRL # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_TREECTRL must be defined." +# error "wxUSE_TREECTRL must be defined, please read comment near the top of this file." # else # define wxUSE_TREECTRL 0 # endif #endif /* !defined(wxUSE_TREECTRL) */ +#ifndef wxUSE_TREELISTCTRL +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_TREELISTCTRL must be defined, please read comment near the top of this file." +# else +# define wxUSE_TREELISTCTRL 0 +# endif +#endif /* !defined(wxUSE_TREELISTCTRL) */ + +#ifndef wxUSE_UIACTIONSIMULATOR +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_UIACTIONSIMULATOR must be defined, please read comment near the top of this file." +# else +# define wxUSE_UIACTIONSIMULATOR 0 +# endif +#endif /* !defined(wxUSE_UIACTIONSIMULATOR) */ + #ifndef wxUSE_VALIDATORS # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_VALIDATORS must be defined." +# error "wxUSE_VALIDATORS must be defined, please read comment near the top of this file." # else # define wxUSE_VALIDATORS 0 # endif #endif /* !defined(wxUSE_VALIDATORS) */ +#ifndef wxUSE_WEBVIEW +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_WEBVIEW must be defined, please read comment near the top of this file." +# else +# define wxUSE_WEBVIEW 0 +# endif +#endif /* !defined(wxUSE_WEBVIEW) */ + #ifndef wxUSE_WXHTML_HELP # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_WXHTML_HELP must be defined." +# error "wxUSE_WXHTML_HELP must be defined, please read comment near the top of this file." # else # define wxUSE_WXHTML_HELP 0 # endif @@ -1042,7 +1194,7 @@ #ifndef wxUSE_XRC # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_XRC must be defined." +# error "wxUSE_XRC must be defined, please read comment near the top of this file." # else # define wxUSE_XRC 0 # endif @@ -1057,12 +1209,13 @@ checks use wxUSE_XXX symbols in #if tests. */ -#if defined(__WXPALMOS__) -# include "wx/palmos/chkconf.h" -#elif defined(__WXWINCE__) +#if defined(__WXWINCE__) # include "wx/msw/wince/chkconf.h" -#elif defined(__WXMSW__) +#elif defined(__WINDOWS__) # include "wx/msw/chkconf.h" +# if defined(__WXGTK__) +# include "wx/gtk/chkconf.h" +# endif #elif defined(__WXGTK__) # include "wx/gtk/chkconf.h" #elif defined(__WXCOCOA__) @@ -1071,21 +1224,21 @@ # include "wx/osx/chkconf.h" #elif defined(__OS2__) # include "wx/os2/chkconf.h" -#elif defined(__WXMGL__) -# include "wx/mgl/chkconf.h" #elif defined(__WXDFB__) # include "wx/dfb/chkconf.h" #elif defined(__WXMOTIF__) # include "wx/motif/chkconf.h" #elif defined(__WXX11__) # include "wx/x11/chkconf.h" +#elif defined(__WXANDROID__) +# include "wx/android/chkconf.h" #endif /* __UNIX__ is also defined under Cygwin but we shouldn't perform these checks - there if we're building wxMSW. + there if we're building Windows ports. */ -#if defined(__UNIX__) && !defined(__WXMSW__) +#if defined(__UNIX__) && !defined(__WINDOWS__) # include "wx/unix/chkconf.h" #endif @@ -1264,15 +1417,6 @@ # endif #endif /* wxUSE_TEXTFILE */ -#if wxUSE_XML && !wxUSE_WCHAR_T -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_XML requires wxUSE_WCHAR_T" -# else -# undef wxUSE_XML -# define wxUSE_XML 0 -# endif -#endif /* wxUSE_XML */ - #if !wxUSE_DYNLIB_CLASS # if wxUSE_DYNAMIC_LOADER # ifdef wxABORT_ON_CONFIG_ERROR @@ -1318,7 +1462,7 @@ */ #if wxUSE_GUI -#if wxUSE_ACCESSIBILITY && !defined(__WXMSW__) && !defined(__GCCXML__) +#if wxUSE_ACCESSIBILITY && !defined(__WXMSW__) # ifdef wxABORT_ON_CONFIG_ERROR # error "wxUSE_ACCESSIBILITY is currently only supported under wxMSW" # else @@ -1355,7 +1499,8 @@ wxUSE_STATUSBAR || \ wxUSE_TEXTCTRL || \ wxUSE_TOOLBAR || \ - wxUSE_TREECTRL + wxUSE_TREECTRL || \ + wxUSE_TREELISTCTRL # if !wxUSE_CONTROLS # ifdef wxABORT_ON_CONFIG_ERROR # error "wxUSE_CONTROLS unset but some controls used" @@ -1377,6 +1522,17 @@ # endif #endif /* wxUSE_BMPBUTTON */ +#if wxUSE_COMMANDLINKBUTTON +# if !wxUSE_BUTTON +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_COMMANDLINKBUTTON requires wxUSE_BUTTON" +# else +# undef wxUSE_BUTTON +# define wxUSE_BUTTON 1 +# endif +# endif +#endif /* wxUSE_COMMANDLINKBUTTON */ + /* wxUSE_BOOKCTRL should be only used if any of the controls deriving from it are used @@ -1472,13 +1628,22 @@ # endif #endif /* wxUSE_REARRANGECTRL */ +#if wxUSE_RICHMSGDLG +# if !wxUSE_MSGDLG +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_RICHMSGDLG requires wxUSE_MSGDLG" +# else +# undef wxUSE_MSGDLG +# define wxUSE_MSGDLG 1 +# endif +# endif +#endif /* wxUSE_RICHMSGDLG */ + /* don't attempt to use native status bar on the platforms not having it */ #ifndef wxUSE_NATIVE_STATUSBAR # define wxUSE_NATIVE_STATUSBAR 0 #elif wxUSE_NATIVE_STATUSBAR -# if defined(__WXUNIVERSAL__) || !( defined(__WXMSW__) || \ - defined(__WXMAC__) || \ - defined(__WXPALMOS__) ) +# if defined(__WXUNIVERSAL__) || !(defined(__WXMSW__) || defined(__WXMAC__)) # undef wxUSE_NATIVE_STATUSBAR # define wxUSE_NATIVE_STATUSBAR 0 # endif @@ -1533,6 +1698,17 @@ #endif /* wxUSE_FILEDLG */ /* common dependencies */ +#if wxUSE_ARTPROVIDER_TANGO +# if !(wxUSE_STREAMS && wxUSE_IMAGE && wxUSE_LIBPNG) +# ifdef wxABORT_ON_CONFIG_ERROR +# error "Tango art provider requires wxImage with streams and PNG support" +# else +# undef wxUSE_ARTPROVIDER_TANGO +# define wxUSE_ARTPROVIDER_TANGO 0 +# endif +# endif +#endif /* wxUSE_ARTPROVIDER_TANGO */ + #if wxUSE_CALENDARCTRL # if !(wxUSE_SPINBTN && wxUSE_COMBOBOX) # ifdef wxABORT_ON_CONFIG_ERROR @@ -1555,16 +1731,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 @@ -1588,6 +1764,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 @@ -1764,6 +1951,15 @@ # define wxUSE_STREAMS 1 # endif # endif + +# if !wxUSE_FILE_HISTORY +# ifdef wxABORT_ON_CONFIG_ERROR +# error "DocView requires wxUSE_FILE_HISTORY" +# else +# undef wxUSE_FILE_HISTORY +# define wxUSE_FILE_HISTORY 1 +# endif +# endif #endif /* wxUSE_DOC_VIEW_ARCHITECTURE */ #if wxUSE_PRINTING_ARCHITECTURE @@ -1809,7 +2005,7 @@ #endif /* wxUSE_FILEDLG */ #if !wxUSE_GAUGE || !wxUSE_BUTTON -# if wxUSE_PROGRESSDLG && !defined(__WXPALMOS__) +# if wxUSE_PROGRESSDLG # ifdef wxABORT_ON_CONFIG_ERROR # error "Generic progress dialog requires wxUSE_GAUGE and wxUSE_BUTTON" # else @@ -1851,7 +2047,7 @@ #endif #if !wxUSE_IMAGLIST -# if wxUSE_TREECTRL || wxUSE_NOTEBOOK || wxUSE_LISTCTRL +# if wxUSE_TREECTRL || wxUSE_NOTEBOOK || wxUSE_LISTCTRL || wxUSE_TREELISTCTRL # ifdef wxABORT_ON_CONFIG_ERROR # error "wxImageList must be compiled as well" # else @@ -1870,7 +2066,7 @@ # define wxUSE_RADIOBTN 1 # endif # endif -# if !wxUSE_STATBOX && !defined(__WXPALMOS__) +# if !wxUSE_STATBOX # ifdef wxABORT_ON_CONFIG_ERROR # error "wxUSE_RADIOBOX requires wxUSE_STATBOX" # else @@ -1958,6 +2154,15 @@ # endif #endif /* wxUSE_SVG */ +#if wxUSE_TASKBARICON && !wxUSE_MENUS +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_TASKBARICON requires wxUSE_MENUS" +# else +# undef wxUSE_TASKBARICON +# define wxUSE_TASKBARICON 0 +# endif +#endif /* wxUSE_TASKBARICON */ + #if !wxUSE_VARIANT # if wxUSE_DATAVIEWCTRL # ifdef wxABORT_ON_CONFIG_ERROR @@ -1969,6 +2174,24 @@ # endif #endif /* wxUSE_VARIANT */ +#if wxUSE_TREELISTCTRL && !wxUSE_DATAVIEWCTRL +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_TREELISTCTRL requires wxDataViewCtrl" +# else +# undef wxUSE_TREELISTCTRL +# define wxUSE_TREELISTCTRL 0 +# endif +#endif /* wxUSE_TREELISTCTRL */ + +#if wxUSE_WEBVIEW && !(wxUSE_WEBVIEW_WEBKIT || wxUSE_WEBVIEW_IE) +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_WEBVIEW requires at least one backend" +# else +# undef wxUSE_WEBVIEW +# define wxUSE_WEBVIEW 0 +# endif +#endif /* wxUSE_WEBVIEW && !any web view backend */ + #endif /* wxUSE_GUI */ #endif /* _WX_CHKCONF_H_ */