X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8ba1644391f9fd8fa7f2d2a9c102cd78a1d799cb..269619bfbd81e1062a867a5162c058980ee972ab:/include/wx/chkconf.h diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h index c808d500f1..ccb3fb687a 100644 --- a/include/wx/chkconf.h +++ b/include/wx/chkconf.h @@ -14,36 +14,36 @@ #define _WX_CHKCONF_H_ /* - Platform-specific checking. + ************************************************** + 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 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 it + 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). */ -#if defined(__WXPALMOS__) -# include "wx/palmos/chkconf.h" -#elif defined(__WXWINCE__) -# include "wx/msw/wince/chkconf.h" -#elif defined(__WXMSW__) -# include "wx/msw/chkconf.h" -#elif defined(__WXMAC__) -# include "wx/mac/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" -#endif - -#ifdef __UNIX__ -# include "wx/unix/chkconf.h" -#endif - -#ifdef __WXUNIVERSAL__ -# include "wx/univ/chkconf.h" -#endif +/* + This file has the following sections: + 1. checks that all wxUSE_XXX symbols we use are defined + a) first the non-GUI ones + b) then the GUI-only ones + 2. platform-specific checks done in the platform headers + 3. generic consistency checks + a) first the non-GUI ones + b) then the GUI-only ones + */ /* this global setting determines what should we do if the setting FOO @@ -84,32 +84,30 @@ /* - tests for non GUI features + Section 1a: tests for non GUI features. 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 @@ -117,7 +115,7 @@ #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 @@ -125,7 +123,7 @@ #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 @@ -133,28 +131,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 @@ -162,7 +187,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 @@ -170,7 +195,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 @@ -178,7 +203,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 @@ -186,7 +211,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 @@ -194,7 +219,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 @@ -212,7 +237,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 @@ -220,7 +245,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 @@ -228,7 +253,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 @@ -236,7 +261,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 @@ -244,7 +269,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 @@ -252,7 +277,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 @@ -260,7 +285,7 @@ #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 @@ -268,7 +293,7 @@ #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 @@ -276,7 +301,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 @@ -284,7 +309,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 @@ -292,7 +317,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 @@ -300,7 +325,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 @@ -308,7 +333,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 @@ -316,14 +341,22 @@ #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) */ + /* - all these tests are for GUI only + Section 1b: all these tests are for GUI only. please keep the options in alphabetical order! */ @@ -336,7 +369,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 @@ -344,23 +377,39 @@ #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_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 @@ -368,7 +417,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 @@ -376,15 +425,27 @@ #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) */ +/* + This one is special, it's only used under wxGTK currently so don't require + pre-defining it. + */ +#ifndef wxUSE_CAIRO +# ifdef __WXGTK210__ +# define wxUSE_CAIRO 1 +# else +# define wxUSE_CAIRO 0 +# endif +#endif + #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 @@ -392,7 +453,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 @@ -400,7 +461,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 @@ -408,7 +469,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 @@ -416,7 +477,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 @@ -424,7 +485,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 @@ -432,7 +493,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 @@ -440,7 +501,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 @@ -448,7 +509,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 @@ -456,7 +517,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 @@ -464,7 +525,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 @@ -472,7 +533,7 @@ #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 @@ -480,7 +541,7 @@ #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 @@ -488,7 +549,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 @@ -496,7 +557,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 @@ -504,7 +565,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 @@ -512,7 +573,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 @@ -520,7 +581,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 @@ -528,15 +589,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 @@ -544,7 +613,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 @@ -552,7 +621,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 @@ -560,7 +629,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 @@ -568,7 +637,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 @@ -576,7 +645,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 @@ -584,7 +653,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 @@ -593,15 +662,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 @@ -609,7 +686,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 @@ -617,19 +694,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 @@ -638,7 +715,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 @@ -646,7 +723,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 @@ -654,15 +731,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 @@ -670,7 +755,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 @@ -678,7 +763,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 @@ -686,7 +771,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 @@ -694,7 +779,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 @@ -702,7 +787,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 @@ -710,7 +795,7 @@ #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 @@ -718,7 +803,7 @@ #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 @@ -726,7 +811,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 @@ -734,7 +819,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 @@ -742,7 +827,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 @@ -750,15 +835,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 @@ -766,7 +859,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 @@ -774,7 +867,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 @@ -782,7 +875,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 @@ -790,7 +883,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 @@ -798,15 +891,31 @@ #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_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 @@ -814,7 +923,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 @@ -822,7 +931,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 @@ -830,7 +939,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 @@ -838,7 +947,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 @@ -846,7 +955,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 @@ -854,7 +963,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 @@ -862,7 +971,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 @@ -870,7 +979,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 @@ -878,7 +987,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 @@ -886,7 +995,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 @@ -894,7 +1003,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 @@ -902,23 +1011,23 @@ #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 +#ifndef wxUSE_TASKBARICON # ifdef wxABORT_ON_CONFIG_ERROR -# error "wxUSE_TAB_DIALOG must be defined." +# error "wxUSE_TASKBARICON must be defined, please read comment near the top of this file." # else -# define wxUSE_TAB_DIALOG 0 +# define wxUSE_TASKBARICON 0 # endif -#endif /* !defined(wxUSE_TAB_DIALOG) */ +#endif /* !defined(wxUSE_TASKBARICON) */ #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 @@ -926,7 +1035,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 @@ -934,7 +1043,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 @@ -942,7 +1051,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 @@ -950,7 +1059,7 @@ #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 @@ -958,7 +1067,7 @@ #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 @@ -966,7 +1075,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 @@ -974,7 +1083,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 @@ -983,7 +1092,50 @@ #endif /* wxUSE_GUI */ /* - check consistency of the settings + Section 2: platform-specific checks. + + This must be done after checking that everything is defined as the platform + checks use wxUSE_XXX symbols in #if tests. + */ + +#if defined(__WXPALMOS__) +# include "wx/palmos/chkconf.h" +#elif defined(__WXWINCE__) +# include "wx/msw/wince/chkconf.h" +#elif defined(__WXMSW__) +# 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/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" +#endif + +/* + __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 + +#ifdef __WXUNIVERSAL__ +# include "wx/univ/chkconf.h" +#endif + +/* + Section 3a: check consistency of the non-GUI settings. */ #if WXWIN_COMPATIBILITY_2_6 @@ -1008,15 +1160,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 @@ -1144,17 +1287,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" @@ -1222,9 +1354,20 @@ # endif #endif /* wxUSE_TARSTREAM */ -/* the rest of the tests is for the GUI settings only */ +/* + Section 3b: the tests for the GUI settings only. + */ #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 || \ @@ -1235,11 +1378,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 || \ @@ -1337,13 +1482,37 @@ #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 */ + /* don't attempt to use native status bar on the platforms not having it */ #ifndef wxUSE_NATIVE_STATUSBAR # define wxUSE_NATIVE_STATUSBAR 0 @@ -1366,40 +1535,6 @@ #endif /* wxUSE_GRAPHICS_CONTEXT */ -/* wxGTK-specific dependencies */ -#ifdef __WXGTK__ -# ifndef __WXUNIVERSAL__ -# if wxUSE_MDI_ARCHITECTURE && !wxUSE_MENUS -# ifdef wxABORT_ON_CONFIG_ERROR -# error "MDI requires wxUSE_MENUS in wxGTK" -# else -# undef wxUSE_MENUS -# define wxUSE_MENUS 1 -# endif -# endif -# endif /* !__WXUNIVERSAL__ */ - -# if wxUSE_JOYSTICK -# if !wxUSE_THREADS -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxJoystick requires threads in wxGTK" -# else -# undef wxUSE_JOYSTICK -# define wxUSE_JOYSTICK 0 -# endif -# endif -# endif -#endif /* wxGTK && !wxUniv */ - -/* Hopefully we can emulate these dialogs in due course */ -#if defined(__SMARTPHONE__) && defined(__WXWINCE__) -# ifdef wxUSE_COLOURDLG -# undef wxUSE_COLOURDLG -# define wxUSE_COLOURDLG 0 -# endif -#endif /* __SMARTPHONE__ && __WXWINCE__ */ - - /* generic controls dependencies */ #if !defined(__WXMSW__) || defined(__WXUNIVERSAL__) # if wxUSE_FONTDLG || wxUSE_FILEDLG || wxUSE_CHOICEDLG @@ -1427,6 +1562,17 @@ # 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_CALENDARCTRL # if !(wxUSE_SPINBTN && wxUSE_COMBOBOX) @@ -1835,6 +1981,24 @@ # 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_VARIANT # if wxUSE_DATAVIEWCTRL # ifdef wxABORT_ON_CONFIG_ERROR @@ -1844,15 +2008,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 */