X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6619edf0ea94b6623f1c7e7875d5ca8abac23382..c1313b54c69ae2ca1b7987450a6bbac567b7e400:/include/wx/chkconf.h diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h index 609d019950..fa88745fc5 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 @@ -68,27 +89,25 @@ please keep the options in alphabetical order! */ -#ifndef wxUSE_CONSOLE_EVENTLOOP +#ifndef wxUSE_ANY # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_CONSOLE_EVENTLOOP must be defined." +# error "wxUSE_ANY must be defined, please read comment near the top of this file." # else -# define wxUSE_CONSOLE_EVENTLOOP 0 +# define wxUSE_ANY 0 # endif -#endif /* !defined(wxUSE_CONSOLE_EVENTLOOP) */ +#endif /* wxUSE_ANY */ -#ifndef wxUSE_CRASHREPORT - /* this one is special: as currently it is Windows-only, don't force it - to be defined on other platforms */ -# if defined(wxABORT_ON_CONFIG_ERROR) && defined(__WXMSW__) -# error "wxUSE_CRASHREPORT must be defined." +#ifndef wxUSE_CONSOLE_EVENTLOOP +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_CONSOLE_EVENTLOOP must be defined, please read comment near the top of this file." # else -# define wxUSE_CRASHREPORT 0 +# define wxUSE_CONSOLE_EVENTLOOP 0 # endif -#endif /* !defined(wxUSE_CRASHREPORT) */ +#endif /* !defined(wxUSE_CONSOLE_EVENTLOOP) */ #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 @@ -96,15 +115,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 @@ -112,28 +139,55 @@ #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 #endif /* !defined(wxUSE_FS_ARCHIVE) */ -/* don't give an error about this one yet, it's not fully implemented */ #ifndef wxUSE_FSVOLUME -# define wxUSE_FSVOLUME 0 +# ifdef wxABORT_ON_CONFIG_ERROR +# 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 #endif /* !defined(wxUSE_DYNAMIC_LOADER) */ +#ifndef wxUSE_INTL +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_INTL must be defined, please read comment near the top of this file." +# else +# define wxUSE_INTL 0 +# endif +#endif /* !defined(wxUSE_INTL) */ + +#ifndef wxUSE_IPV6 +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_IPV6 must be defined, please read comment near the top of this file." +# else +# define wxUSE_IPV6 0 +# endif +#endif /* !defined(wxUSE_IPV6) */ + #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 @@ -141,7 +195,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 @@ -149,7 +203,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 @@ -157,7 +211,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 @@ -165,7 +219,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 @@ -173,7 +227,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 @@ -191,7 +245,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 @@ -199,7 +253,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 @@ -207,7 +261,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 @@ -215,7 +269,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 @@ -223,7 +277,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 @@ -231,7 +285,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 @@ -239,15 +293,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 @@ -255,7 +325,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 @@ -263,7 +333,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 @@ -271,7 +341,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 @@ -279,7 +349,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 @@ -287,7 +357,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 @@ -295,12 +365,20 @@ #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 #endif /* wxUSE_VARIANT */ +#ifndef wxUSE_XLOCALE +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_XLOCALE must be defined, please read comment near the top of this file." +# else +# define wxUSE_XLOCALE 0 +# endif +#endif /* !defined(wxUSE_XLOCALE) */ + /* Section 1b: all these tests are for GUI only. @@ -315,7 +393,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 @@ -323,23 +401,55 @@ #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 #endif /* !defined(wxUSE_ACCEL) */ +#ifndef wxUSE_ACCESSIBILITY +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_ACCESSIBILITY must be defined, please read comment near the top of this file." +# else +# define wxUSE_ACCESSIBILITY 0 +# endif +#endif /* !defined(wxUSE_ACCESSIBILITY) */ + #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, please read comment near the top of this file." +# else +# define wxUSE_AUTOID_MANAGEMENT 0 +# endif +#endif /* !defined(wxUSE_AUTOID_MANAGEMENT) */ + #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 @@ -347,7 +457,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 @@ -355,15 +465,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 @@ -371,7 +489,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 @@ -379,7 +497,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 @@ -387,7 +505,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 @@ -395,7 +513,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 @@ -403,7 +521,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 @@ -411,7 +529,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 @@ -419,7 +537,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 @@ -427,7 +545,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 @@ -435,7 +553,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 @@ -443,7 +561,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 @@ -451,15 +569,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 @@ -467,7 +593,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 @@ -475,7 +601,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 @@ -483,7 +609,7 @@ #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 @@ -491,7 +617,7 @@ #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 @@ -499,7 +625,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 @@ -507,15 +633,23 @@ #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 #endif /* !defined(wxUSE_DOC_VIEW_ARCHITECTURE) */ +#ifndef wxUSE_FILECTRL +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_FILECTRL must be defined, please read comment near the top of this file." +# else +# define wxUSE_FILECTRL 0 +# endif +#endif /* !defined(wxUSE_FILECTRL) */ + #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 @@ -523,7 +657,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 @@ -531,7 +665,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 @@ -539,7 +673,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 @@ -547,7 +681,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 @@ -555,7 +689,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 @@ -563,7 +697,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 @@ -572,15 +706,23 @@ #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 #endif /* !defined(wxUSE_GRID) */ +#ifndef wxUSE_HEADERCTRL +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_HEADERCTRL must be defined, please read comment near the top of this file." +# else +# define wxUSE_HEADERCTRL 0 +# endif +#endif /* !defined(wxUSE_HEADERCTRL) */ + #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 @@ -588,7 +730,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 @@ -596,19 +738,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 -# ifndef __UNIX__ +# if !defined(__UNIX__) || defined(__WXPALMOS__) /* 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 @@ -617,7 +759,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 @@ -625,7 +767,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 @@ -633,15 +775,23 @@ #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 #endif /* !defined(wxUSE_IMAGLIST) */ +#ifndef wxUSE_INFOBAR +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_INFOBAR must be defined, please read comment near the top of this file." +# else +# define wxUSE_INFOBAR 0 +# endif +#endif /* !defined(wxUSE_INFOBAR) */ + #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 @@ -649,7 +799,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 @@ -657,7 +807,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 @@ -665,7 +815,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 @@ -673,7 +823,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 @@ -681,7 +831,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 @@ -689,15 +839,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 @@ -705,7 +863,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 @@ -713,7 +871,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 @@ -721,7 +879,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 @@ -729,15 +887,23 @@ #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 #endif /* !defined(wxUSE_NOTEBOOK) */ +#ifndef wxUSE_NOTIFICATION_MESSAGE +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_NOTIFICATION_MESSAGE must be defined, please read comment near the top of this file." +# else +# define wxUSE_NOTIFICATION_MESSAGE 0 +# endif +#endif /* !defined(wxUSE_NOTIFICATION_MESSAGE) */ + #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 @@ -745,7 +911,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 @@ -753,7 +919,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 @@ -761,7 +927,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 @@ -769,7 +935,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 @@ -777,15 +943,39 @@ #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 #endif /* !defined(wxUSE_RADIOBTN) */ +#ifndef wxUSE_REARRANGECTRL +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_REARRANGECTRL must be defined, please read comment near the top of this file." +# else +# define wxUSE_REARRANGECTRL 0 +# endif +#endif /* !defined(wxUSE_REARRANGECTRL) */ + +#ifndef wxUSE_RIBBON +# ifdef wxABORT_ON_CONFIG_ERROR +# 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_RIBBON) */ + #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 @@ -793,7 +983,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 @@ -801,7 +991,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 @@ -809,7 +999,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 @@ -817,7 +1007,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 @@ -825,7 +1015,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 @@ -833,7 +1023,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 @@ -841,7 +1031,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 @@ -849,7 +1039,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 @@ -857,7 +1047,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 @@ -865,7 +1055,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 @@ -873,7 +1063,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 @@ -881,23 +1071,15 @@ #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 #endif /* !defined(wxUSE_STATUSBAR) */ -#ifndef wxUSE_TAB_DIALOG -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_TAB_DIALOG must be defined." -# else -# define wxUSE_TAB_DIALOG 0 -# endif -#endif /* !defined(wxUSE_TAB_DIALOG) */ - #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 @@ -905,7 +1087,7 @@ #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 @@ -913,7 +1095,7 @@ #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 @@ -921,7 +1103,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 @@ -929,7 +1111,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 @@ -937,15 +1119,23 @@ #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_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 @@ -953,7 +1143,7 @@ #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 @@ -961,7 +1151,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 @@ -984,8 +1174,10 @@ # include "wx/msw/chkconf.h" #elif defined(__WXGTK__) # include "wx/gtk/chkconf.h" +#elif defined(__WXCOCOA__) +# include "wx/cocoa/chkconf.h" #elif defined(__WXMAC__) -# include "wx/mac/chkconf.h" +# include "wx/osx/chkconf.h" #elif defined(__OS2__) # include "wx/os2/chkconf.h" #elif defined(__WXMGL__) @@ -998,7 +1190,11 @@ # include "wx/x11/chkconf.h" #endif -#ifdef __UNIX__ +/* + __UNIX__ is also defined under Cygwin but we shouldn't perform these checks + there if we're building wxMSW. + */ +#if defined(__UNIX__) && !defined(__WXMSW__) # include "wx/unix/chkconf.h" #endif @@ -1032,15 +1228,6 @@ # endif #endif /* wxUSE_ARCHIVE_STREAMS */ -#if wxUSE_CRASHREPORT && !wxUSE_ON_FATAL_EXCEPTION -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_CRASHREPORT requires wxUSE_ON_FATAL_EXCEPTION" -# else -# undef wxUSE_CRASHREPORT -# define wxUSE_CRASHREPORT 0 -# endif -#endif /* wxUSE_CRASHREPORT */ - #if wxUSE_PROTOCOL_FILE || wxUSE_PROTOCOL_FTP || wxUSE_PROTOCOL_HTTP # if !wxUSE_PROTOCOL # ifdef wxABORT_ON_CONFIG_ERROR @@ -1168,17 +1355,6 @@ # endif #endif /* wxUSE_MIMETYPE */ -#if wxUSE_ODBC -# if !wxUSE_DATETIME -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxODBC requires wxUSE_DATETIME" -# else -# undef wxUSE_ODBC -# define wxUSE_ODBC 0 -# endif -# endif -#endif /* wxUSE_ODBC */ - #if wxUSE_TEXTFILE && !wxUSE_TEXTBUFFER # ifdef wxABORT_ON_CONFIG_ERROR # error "wxUSE_TEXTFILE requires wxUSE_TEXTBUFFER" @@ -1197,15 +1373,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 @@ -1251,6 +1418,15 @@ */ #if wxUSE_GUI +#if wxUSE_ACCESSIBILITY && !defined(__WXMSW__) && !defined(__GCCXML__) +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_ACCESSIBILITY is currently only supported under wxMSW" +# else +# undef wxUSE_ACCESSIBILITY +# define wxUSE_ACCESSIBILITY 0 +# endif +#endif /* wxUSE_ACCESSIBILITY */ + #if wxUSE_BUTTON || \ wxUSE_CALENDARCTRL || \ wxUSE_CARET || \ @@ -1261,11 +1437,13 @@ wxUSE_CHOICE || \ wxUSE_GAUGE || \ wxUSE_GRID || \ + wxUSE_HEADERCTRL || \ wxUSE_LISTBOX || \ wxUSE_LISTCTRL || \ wxUSE_NOTEBOOK || \ wxUSE_RADIOBOX || \ wxUSE_RADIOBTN || \ + wxUSE_REARRANGECTRL || \ wxUSE_SCROLLBAR || \ wxUSE_SLIDER || \ wxUSE_SPINBTN || \ @@ -1299,6 +1477,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 @@ -1363,13 +1552,48 @@ #if !wxUSE_ODCOMBOBOX # if wxUSE_BITMAPCOMBOBOX -# error "wxBitmapComboBox requires wxOwnerDrawnComboBox" -# else -# undef wxUSE_BITMAPCOMBOBOX -# define wxUSE_BITMAPCOMBOBOX 0 +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxBitmapComboBox requires wxOwnerDrawnComboBox" +# else +# undef wxUSE_BITMAPCOMBOBOX +# define wxUSE_BITMAPCOMBOBOX 0 +# endif # endif #endif /* !wxUSE_ODCOMBOBOX */ +#if !wxUSE_HEADERCTRL +# if wxUSE_DATAVIEWCTRL || wxUSE_GRID +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxDataViewCtrl and wxGrid require wxHeaderCtrl" +# else +# undef wxUSE_HEADERCTRL +# define wxUSE_HEADERCTRL 1 +# endif +# endif +#endif /* !wxUSE_HEADERCTRL */ + +#if wxUSE_REARRANGECTRL +# if !wxUSE_CHECKLISTBOX +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxRearrangeCtrl requires wxCheckListBox" +# else +# undef wxUSE_REARRANGECTRL +# define wxUSE_REARRANGECTRL 0 +# endif +# 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 @@ -1419,7 +1643,29 @@ # endif #endif /* !wxMSW || wxUniv */ +/* generic file dialog depends on (generic) file control */ +#if wxUSE_FILEDLG && !wxUSE_FILECTRL && \ + (defined(__WXUNIVERSAL__) || defined(__WXGTK__)) +# ifdef wxABORT_ON_CONFIG_ERROR +# error "Generic wxFileDialog requires wxFileCtrl" +# else +# undef wxUSE_FILECTRL +# define wxUSE_FILECTRL 1 +# endif +#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 @@ -1651,6 +1897,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 @@ -1827,6 +2082,33 @@ # endif #endif /* wxUSE_SVG */ +#if wxUSE_SVG && !wxUSE_IMAGE +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_SVG requires wxUSE_IMAGE" +# else +# undef wxUSE_SVG +# define wxUSE_SVG 0 +# endif +#endif /* wxUSE_SVG */ + +#if wxUSE_SVG && !wxUSE_LIBPNG +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_SVG requires wxUSE_LIBPNG" +# else +# undef wxUSE_SVG +# define wxUSE_SVG 0 +# 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 @@ -1836,15 +2118,6 @@ # define wxUSE_DATAVIEWCTRL 0 # endif # endif - -# if wxUSE_ODBC -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_ODBC requires wxVariant" -# else -# undef wxUSE_ODBC -# define wxUSE_ODBC 0 -# endif -# endif #endif /* wxUSE_VARIANT */ #endif /* wxUSE_GUI */