Fixed initialisation order warning

[wxWidgets.git] / include / wx / chkconf.h

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 361ba6b5394ac162e551e0b588e71e3e5b9f74b4..34ee4789e97edea85e466450b113f9cd6d4795ef 100644 (file)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -1,33 +1,49 @@
-/**
-* Name:        wx/chkconf.h
-* Purpose:     check the config settings for consistency
-* Author:      Vadim Zeitlin
-* Modified by:
-* Created:     09.08.00
-* RCS-ID:      $Id$
-* Copyright:   (c) 2000 Vadim Zeitlin <vadim@wxwidgets.org>
-* Licence:     wxWindows licence
-*/
+/*
+ * Name:        wx/chkconf.h
+ * Purpose:     check the config settings for consistency
+ * Author:      Vadim Zeitlin
+ * Modified by:
+ * Created:     09.08.00
+ * RCS-ID:      $Id$
+ * Copyright:   (c) 2000 Vadim Zeitlin <vadim@wxwidgets.org>
+ * Licence:     wxWindows licence
+ */

 
 /* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
 
 /*
 
 /* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
 
 /*

-   Compiler-specific checking.
+   Platform-specific checking.

  */
 
 #if defined(__WXPALMOS__)
 #  include "wx/palmos/chkconf.h"
  */
 
 #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(__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 __WXUNIVERSAL__
+#   include "wx/univ/chkconf.h"

 #endif
 
 /*
    this global setting determines what should we do if the setting FOO
 #endif
 
 /*
    this global setting determines what should we do if the setting FOO

-   requires BAR and BAR is not set: we can either silently define BAR
-   (default, recommended) or give an error and abort (mainly useful for
-   developers only)
+   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)

  */
 #define wxABORT_ON_CONFIG_ERROR
 
  */
 #define wxABORT_ON_CONFIG_ERROR
 


@@ -54,11 +70,37 @@
 #   define wxUSE_EXCEPTIONS 0
 #endif /* wxNO_EXCEPTIONS */
 
 #   define wxUSE_EXCEPTIONS 0
 #endif /* wxNO_EXCEPTIONS */
 

+/* we also must disable exceptions if compiler doesn't support them */
+#if defined(_MSC_VER) && !defined(_CPPUNWIND)
+#   undef wxUSE_EXCEPTIONS
+#   define wxUSE_EXCEPTIONS 0
+#endif /* VC++ without exceptions support */
+

 
 /*
    tests for non GUI features
 
 /*
    tests for non GUI features

+
+   please keep the options in alphabetical order!

  */
 
  */
 

+#ifndef wxUSE_BACKINGFILE
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_BACKINGFILE must be defined."
+#   else
+#       define wxUSE_BACKINGFILE 0
+#   endif
+#endif /* !defined(wxUSE_BACKINGFILE) */
+
+#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."
+#   else
+#       define wxUSE_CRASHREPORT 0
+#   endif
+#endif /* !defined(wxUSE_CRASHREPORT) */
+

 #ifndef wxUSE_DYNLIB_CLASS
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_DYNLIB_CLASS must be defined."
 #ifndef wxUSE_DYNLIB_CLASS
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_DYNLIB_CLASS must be defined."


@@ -120,6 +162,22 @@
 #   endif
 #endif /* !defined(wxUSE_MIMETYPE) */
 
 #   endif
 #endif /* !defined(wxUSE_MIMETYPE) */
 

+#ifndef wxUSE_ON_FATAL_EXCEPTION
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_ON_FATAL_EXCEPTION must be defined."
+#   else
+#       define wxUSE_ON_FATAL_EXCEPTION 0
+#   endif
+#endif /* !defined(wxUSE_ON_FATAL_EXCEPTION) */
+
+#ifndef wxUSE_PRINTF_POS_PARAMS
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_PRINTF_POS_PARAMS must be defined."
+#   else
+#       define wxUSE_PRINTF_POS_PARAMS 0
+#   endif
+#endif /* !defined(wxUSE_PRINTF_POS_PARAMS) */
+

 #ifndef wxUSE_PROTOCOL
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_PROTOCOL must be defined."
 #ifndef wxUSE_PROTOCOL
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_PROTOCOL must be defined."


@@ -170,6 +228,14 @@
 #   endif
 #endif /* !defined(wxUSE_REGEX) */
 
 #   endif
 #endif /* !defined(wxUSE_REGEX) */
 

+#ifndef wxUSE_STDPATHS
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_STDPATHS must be defined."
+#   else
+#       define wxUSE_STDPATHS 1
+#   endif
+#endif /* !defined(wxUSE_STDPATHS) */
+

 #ifndef wxUSE_XML
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_XML must be defined."
 #ifndef wxUSE_XML
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_XML must be defined."


@@ -234,8 +300,18 @@
 #   endif
 #endif /* !defined(wxUSE_URL) */
 
 #   endif
 #endif /* !defined(wxUSE_URL) */
 

+#ifndef wxUSE_VARIANT
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_VARIANT must be defined."
+#   else
+#       define wxUSE_VARIANT 0
+#   endif
+#endif /* wxUSE_VARIANT */
+

 /*
    all these tests are for GUI only
 /*
    all these tests are for GUI only

+
+   please keep the options in alphabetical order!

  */
 #if wxUSE_GUI
 
  */
 #if wxUSE_GUI
 


@@ -244,6 +320,14 @@
    preprocessor about invalid integer expression
  */
 
    preprocessor about invalid integer expression
  */
 

+#ifndef wxUSE_ABOUTDLG
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_ABOUTDLG must be defined."
+#   else
+#       define wxUSE_ABOUTDLG 0
+#   endif
+#endif /* !defined(wxUSE_ABOUTDLG) */
+

 #ifndef wxUSE_ACCEL
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_ACCEL must be defined."
 #ifndef wxUSE_ACCEL
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_ACCEL must be defined."


@@ -252,6 +336,22 @@
 #   endif
 #endif /* !defined(wxUSE_ACCEL) */
 
 #   endif
 #endif /* !defined(wxUSE_ACCEL) */
 

+#ifndef wxUSE_ANIMATIONCTRL
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_ANIMATIONCTRL must be defined."
+#   else
+#       define wxUSE_ANIMATIONCTRL 0
+#   endif
+#endif /* !defined(wxUSE_ANIMATIONCTRL) */
+
+#ifndef wxUSE_BITMAPCOMBOBOX
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_BITMAPCOMBOBOX must be defined."
+#   else
+#       define wxUSE_BITMAPCOMBOBOX 0
+#   endif
+#endif /* !defined(wxUSE_BITMAPCOMBOBOX) */
+

 #ifndef wxUSE_BMPBUTTON
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_BMPBUTTON must be defined."
 #ifndef wxUSE_BMPBUTTON
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_BMPBUTTON must be defined."


@@ -340,6 +440,14 @@
 #   endif
 #endif /* !defined(wxUSE_COLOURDLG) */
 
 #   endif
 #endif /* !defined(wxUSE_COLOURDLG) */
 

+#ifndef wxUSE_COLOURPICKERCTRL
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_COLOURPICKERCTRL must be defined."
+#   else
+#       define wxUSE_COLOURPICKERCTRL 0
+#   endif
+#endif /* !defined(wxUSE_COLOURPICKERCTRL) */
+

 #ifndef wxUSE_COMBOBOX
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_COMBOBOX must be defined."
 #ifndef wxUSE_COMBOBOX
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_COMBOBOX must be defined."


@@ -348,6 +456,14 @@
 #   endif
 #endif /* !defined(wxUSE_COMBOBOX) */
 
 #   endif
 #endif /* !defined(wxUSE_COMBOBOX) */
 

+#ifndef wxUSE_COMBOCTRL
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_COMBOCTRL must be defined."
+#   else
+#       define wxUSE_COMBOCTRL 0
+#   endif
+#endif /* !defined(wxUSE_COMBOCTRL) */
+

 #ifndef wxUSE_DATAOBJ
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_DATAOBJ must be defined."
 #ifndef wxUSE_DATAOBJ
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_DATAOBJ must be defined."


@@ -356,6 +472,30 @@
 #   endif
 #endif /* !defined(wxUSE_DATAOBJ) */
 
 #   endif
 #endif /* !defined(wxUSE_DATAOBJ) */
 

+#ifndef wxUSE_DATAVIEWCTRL
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_DATAVIEWCTRL must be defined."
+#   else
+#       define wxUSE_DATAVIEWCTRL 0
+#   endif
+#endif /* !defined(wxUSE_DATAVIEWCTRL) */
+
+#ifndef wxUSE_DATEPICKCTRL
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_DATEPICKCTRL must be defined."
+#   else
+#       define wxUSE_DATEPICKCTRL 0
+#   endif
+#endif /* !defined(wxUSE_DATEPICKCTRL) */
+
+#ifndef wxUSE_DIRPICKERCTRL
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_DIRPICKERCTRL must be defined."
+#   else
+#       define wxUSE_DIRPICKERCTRL 0
+#   endif
+#endif /* !defined(wxUSE_DIRPICKERCTRL) */
+

 #ifndef wxUSE_DISPLAY
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_DISPLAY must be defined."
 #ifndef wxUSE_DISPLAY
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_DISPLAY must be defined."


@@ -380,6 +520,14 @@
 #   endif
 #endif /* !defined(wxUSE_FILEDLG) */
 
 #   endif
 #endif /* !defined(wxUSE_FILEDLG) */
 

+#ifndef wxUSE_FILEPICKERCTRL
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_FILEPICKERCTRL must be defined."
+#   else
+#       define wxUSE_FILEPICKERCTRL 0
+#   endif
+#endif /* !defined(wxUSE_FILEPICKERCTRL) */
+

 #ifndef wxUSE_FONTDLG
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_FONTDLG must be defined."
 #ifndef wxUSE_FONTDLG
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_FONTDLG must be defined."


@@ -396,6 +544,14 @@
 #   endif
 #endif /* !defined(wxUSE_FONTMAP) */
 
 #   endif
 #endif /* !defined(wxUSE_FONTMAP) */
 

+#ifndef wxUSE_FONTPICKERCTRL
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_FONTPICKERCTRL must be defined."
+#   else
+#       define wxUSE_FONTPICKERCTRL 0
+#   endif
+#endif /* !defined(wxUSE_FONTPICKERCTRL) */
+

 #ifndef wxUSE_GAUGE
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_GAUGE must be defined."
 #ifndef wxUSE_GAUGE
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_GAUGE must be defined."


@@ -404,6 +560,15 @@
 #   endif
 #endif /* !defined(wxUSE_GAUGE) */
 
 #   endif
 #endif /* !defined(wxUSE_GAUGE) */
 

+#ifndef wxUSE_GRAPHICS_CONTEXT
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_GRAPHICS_CONTEXT must be defined."
+#   else
+#       define wxUSE_GRAPHICS_CONTEXT 0
+#   endif
+#endif /* !defined(wxUSE_GRAPHICS_CONTEXT) */
+
+

 #ifndef wxUSE_GRID
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_GRID must be defined."
 #ifndef wxUSE_GRID
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_GRID must be defined."


@@ -420,21 +585,21 @@
 #   endif
 #endif /* !defined(wxUSE_HELP) */
 
 #   endif
 #endif /* !defined(wxUSE_HELP) */
 

-#ifndef wxUSE_HTML
+#ifndef wxUSE_HYPERLINKCTRL

 #   ifdef wxABORT_ON_CONFIG_ERROR
 #   ifdef wxABORT_ON_CONFIG_ERROR

-#       error "wxUSE_HTML must be defined."
+#       error "wxUSE_HYPERLINKCTRL must be defined."

 #   else
 #   else

-#       define wxUSE_HTML 0
+#       define wxUSE_HYPERLINKCTRL 0

 #   endif
 #   endif

-#endif /* !defined(wxUSE_HTML) */
+#endif /* !defined(wxUSE_HYPERLINKCTRL) */

 
 

-#ifndef wxUSE_XRC
+#ifndef wxUSE_HTML

 #   ifdef wxABORT_ON_CONFIG_ERROR
 #   ifdef wxABORT_ON_CONFIG_ERROR

-#       error "wxUSE_XRC must be defined."
+#       error "wxUSE_HTML must be defined."

 #   else
 #   else

-#       define wxUSE_XRC 0
+#       define wxUSE_HTML 0

 #   endif
 #   endif

-#endif /* !defined(wxUSE_XRC) */
+#endif /* !defined(wxUSE_HTML) */

 
 #ifndef wxUSE_LIBMSPACK
 #   ifndef __UNIX__
 
 #ifndef wxUSE_LIBMSPACK
 #   ifndef __UNIX__


@@ -569,6 +734,14 @@
 #   endif
 #endif /* !defined(wxUSE_NOTEBOOK) */
 
 #   endif
 #endif /* !defined(wxUSE_NOTEBOOK) */
 

+#ifndef wxUSE_ODCOMBOBOX
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_ODCOMBOBOX must be defined."
+#   else
+#       define wxUSE_ODCOMBOBOX 0
+#   endif
+#endif /* !defined(wxUSE_ODCOMBOBOX) */
+

 #ifndef wxUSE_PALETTE
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_PALETTE must be defined."
 #ifndef wxUSE_PALETTE
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_PALETTE must be defined."


@@ -777,12 +950,51 @@
 #   endif
 #endif /* !defined(wxUSE_WXHTML_HELP) */
 
 #   endif
 #endif /* !defined(wxUSE_WXHTML_HELP) */
 

+#ifndef wxUSE_XRC
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_XRC must be defined."
+#   else
+#       define wxUSE_XRC 0
+#   endif
+#endif /* !defined(wxUSE_XRC) */
+

 #endif /* wxUSE_GUI */
 
 /*
    check consistency of the settings
  */
 
 #endif /* wxUSE_GUI */
 
 /*
    check consistency of the settings
  */
 

+#if WXWIN_COMPATIBILITY_2_4
+#   if !WXWIN_COMPATIBILITY_2_6
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "2.4.X compatibility requires 2.6.X compatibility"
+#       else
+#           undef WXWIN_COMPATIBILITY_2_6
+#           define WXWIN_COMPATIBILITY_2_6 1
+#       endif
+#   endif
+#endif /* WXWIN_COMPATIBILITY_2_4 */
+
+#if wxUSE_ARCHIVE_STREAMS
+#   if !wxUSE_DATETIME
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxArchive requires wxUSE_DATETIME"
+#       else
+#           undef wxUSE_ARCHIVE_STREAMS
+#           define wxUSE_ARCHIVE_STREAMS 0
+#       endif
+#   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
 #if wxUSE_PROTOCOL_FILE || wxUSE_PROTOCOL_FTP || wxUSE_PROTOCOL_HTTP
 #   if !wxUSE_PROTOCOL
 #        ifdef wxABORT_ON_CONFIG_ERROR


@@ -848,6 +1060,14 @@
 #           define wxUSE_STREAMS 1
 #       endif
 #   endif
 #           define wxUSE_STREAMS 1
 #       endif
 #   endif

+#   if !wxUSE_FILE && !wxUSE_FFILE
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxUSE_FILESYSTEM requires either wxUSE_FILE or wxUSE_FFILE"
+#       else
+#           undef wxUSE_FILESYSTEM
+#           define wxUSE_FILESYSTEM 0
+#       endif
+#   endif

 #endif /* wxUSE_FILESYSTEM */
 
 #if wxUSE_FS_INET
 #endif /* wxUSE_FILESYSTEM */
 
 #if wxUSE_FS_INET


@@ -881,6 +1101,17 @@
 #   endif
 #endif /* wxUSE_MIMETYPE */
 
 #   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"
 #if wxUSE_TEXTFILE && !wxUSE_TEXTBUFFER
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_TEXTFILE requires wxUSE_TEXTBUFFER"


@@ -899,27 +1130,6 @@
 #   endif
 #endif /* wxUSE_TEXTFILE */
 
 #   endif
 #endif /* wxUSE_TEXTFILE */
 

-#if wxUSE_UNICODE_MSLU && !wxUSE_UNICODE
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_UNICODE_MSLU requires wxUSE_UNICODE"
-#   else
-#       undef wxUSE_UNICODE
-#       define wxUSE_UNICODE 1
-#   endif
-#endif /* wxUSE_UNICODE_MSLU */
-
-/* ODBC and Unicode are now compatible */
-
-#if 0 /* wxUSE_ODBC && wxUSE_UNICODE */
-#   ifdef wxABORT_ON_CONFIG_ERROR
-        /* (ODBC classes aren't Unicode-compatible yet) */
-#       error "wxUSE_ODBC can't be used with wxUSE_UNICODE"
-#   else
-#       undef wxUSE_ODBC
-#       define wxUSE_ODBC 0
-#   endif
-#endif /* wxUSE_ODBC */
-

 #if wxUSE_XML && !wxUSE_WCHAR_T
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_XML requires wxUSE_WCHAR_T"
 #if wxUSE_XML && !wxUSE_WCHAR_T
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_XML requires wxUSE_WCHAR_T"


@@ -927,7 +1137,7 @@
 #       undef wxUSE_XML
 #       define wxUSE_XML 0
 #   endif
 #       undef wxUSE_XML
 #       define wxUSE_XML 0
 #   endif

-#endif /* wxUSE_UNICODE_MSLU */
+#endif /* wxUSE_XML */

 
 #if !wxUSE_DYNLIB_CLASS
 #   if wxUSE_DYNAMIC_LOADER
 
 #if !wxUSE_DYNLIB_CLASS
 #   if wxUSE_DYNAMIC_LOADER


@@ -958,6 +1168,17 @@
 #   endif
 #endif /* wxUSE_ZIPSTREAM */
 
 #   endif
 #endif /* wxUSE_ZIPSTREAM */
 

+#if wxUSE_BACKINGFILE
+#   if !wxUSE_STREAMS || (!wxUSE_FILE && !wxUSE_FFILE)
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxBackingFile requires wxStream and wxFile or wxFFile"
+#       else
+#           undef wxUSE_BACKINGFILE
+#           define wxUSE_BACKINGFILE 0
+#       endif
+#   endif
+#endif /* wxUSE_BACKINGFILE */
+

 /* the rest of the tests is for the GUI settings only */
 #if wxUSE_GUI
 
 /* the rest of the tests is for the GUI settings only */
 #if wxUSE_GUI
 


@@ -1009,19 +1230,22 @@
 #    endif
 #endif /* wxUSE_BMPBUTTON */
 
 #    endif
 #endif /* wxUSE_BMPBUTTON */
 

-#if wxUSE_NOTEBOOK || wxUSE_LISTBOOK || wxUSE_CHOICEBOOK
-#   if defined(wxUSE_BOOKCTRL) && !wxUSE_BOOKCTRL
-#       ifdef wxABORT_ON_CONFIG_ERROR
-#           error "wxUSE_BOOKCTRL must be set."
-#       else
-#           undef wxUSE_BOOKCTRL
-#       endif
+/*
+   wxUSE_BOOKCTRL should be only used if any of the controls deriving from it
+   are used
+ */
+#ifdef wxUSE_BOOKCTRL
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_BOOKCTRL is defined automatically, don't define it"
+#   else
+#       undef wxUSE_BOOKCTRL

 #   endif
 #   endif

+#endif

 
 

-#   ifndef wxUSE_BOOKCTRL
-#       define wxUSE_BOOKCTRL 1
-#   endif
-#endif /* wxUSE_NOTEBOOK */
+#define wxUSE_BOOKCTRL (wxUSE_NOTEBOOK || \
+                        wxUSE_LISTBOOK || \
+                        wxUSE_CHOICEBOOK || \
+                        wxUSE_TREEBOOK)

 
 #if wxUSE_LISTBOOK
 #   if !wxUSE_LISTCTRL
 
 #if wxUSE_LISTBOOK
 #   if !wxUSE_LISTCTRL


@@ -1045,6 +1269,15 @@
 #   endif
 #endif /* wxUSE_CHOICEBOOK */
 
 #   endif
 #endif /* wxUSE_CHOICEBOOK */
 

+#if !wxUSE_ODCOMBOBOX
+#   if wxUSE_BITMAPCOMBOBOX
+#       error "wxBitmapComboBox requires wxOwnerDrawnComboBox"
+#   else
+#       undef wxUSE_BITMAPCOMBOBOX
+#       define wxUSE_BITMAPCOMBOBOX 0
+#   endif
+#endif /* !wxUSE_ODCOMBOBOX */
+

 /* don't attempt to use native status bar on the platforms not having it */
 #ifndef wxUSE_NATIVE_STATUSBAR
 #   define wxUSE_NATIVE_STATUSBAR 0
 /* don't attempt to use native status bar on the platforms not having it */
 #ifndef wxUSE_NATIVE_STATUSBAR
 #   define wxUSE_NATIVE_STATUSBAR 0


@@ -1057,59 +1290,15 @@
 #   endif
 #endif
 
 #   endif
 #endif
 

-/* wxUniv-specific dependencies */
-#if defined(__WXUNIVERSAL__)
-#   if (wxUSE_COMBOBOX || wxUSE_MENUS) && !wxUSE_POPUPWIN
-#       ifdef wxABORT_ON_CONFIG_ERROR
-#           error "wxUSE_POPUPWIN must be defined to use comboboxes/menus"
-#       else
-#           undef wxUSE_POPUPWIN
-#           define wxUSE_POPUPWIN 1
-#       endif
+#if wxUSE_GRAPHICS_CONTEXT && !wxUSE_GEOMETRY
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_GRAPHICS_CONTEXT requires wxUSE_GEOMETRY"
+#   else
+#       undef wxUSE_GRAPHICS_CONTEXT
+#       define wxUSE_GRAPHICS_CONTEXT 0

 #   endif
 #   endif

+#endif /* wxUSE_GRAPHICS_CONTEXT */

 
 

-#   if wxUSE_COMBOBOX
-#      if !wxUSE_LISTBOX
-#           ifdef wxABORT_ON_CONFIG_ERROR
-#               error "wxComboBox requires wxListBox in wxUniversal"
-#           else
-#               undef wxUSE_LISTBOX
-#               define wxUSE_LISTBOX 1
-#           endif
-#      endif
-#   endif /* wxUSE_COMBOBOX */
-
-#   if wxUSE_RADIOBTN
-#      if !wxUSE_CHECKBOX
-#           ifdef wxABORT_ON_CONFIG_ERROR
-#               error "wxUSE_RADIOBTN requires wxUSE_CHECKBOX in wxUniversal"
-#           else
-#               undef wxUSE_CHECKBOX
-#               define wxUSE_CHECKBOX 1
-#           endif
-#      endif
-#   endif /* wxUSE_RADIOBTN */
-
-#   if wxUSE_TEXTCTRL
-#       if !wxUSE_CARET
-#           ifdef wxABORT_ON_CONFIG_ERROR
-#               error "wxTextCtrl requires wxCaret in wxUniversal"
-#           else
-#               undef wxUSE_CARET
-#               define wxUSE_CARET 1
-#           endif
-#       endif /* wxUSE_CARET */
-
-#       if !wxUSE_SCROLLBAR
-#           ifdef wxABORT_ON_CONFIG_ERROR
-#               error "wxTextCtrl requires wxScrollBar in wxUniversal"
-#           else
-#               undef wxUSE_SCROLLBAR
-#               define wxUSE_SCROLLBAR 1
-#           endif
-#       endif /* wxUSE_SCROLLBAR */
-#   endif /* wxUSE_TEXTCTRL */
-#endif /* __WXUNIVERSAL__ */

 
 /* wxGTK-specific dependencies */
 #ifdef __WXGTK__
 
 /* wxGTK-specific dependencies */
 #ifdef __WXGTK__


@@ -1136,88 +1325,6 @@
 #   endif
 #endif /* wxGTK && !wxUniv */
 
 #   endif
 #endif /* wxGTK && !wxUniv */
 

-/* wxMSW-specific dependencies */
-#ifdef __WXMSW__
-#   ifndef wxUSE_UNICODE_MSLU
-#       ifdef wxABORT_ON_CONFIG_ERROR
-#           error "wxUSE_UNICODE_MSLU must be defined."
-#       else
-#           define wxUSE_UNICODE_MSLU 0
-#       endif
-#   endif  /* wxUSE_UNICODE_MSLU */
-#   ifndef wxUSE_UXTHEME
-#       ifdef wxABORT_ON_CONFIG_ERROR
-#           error "wxUSE_UXTHEME must be defined."
-#       else
-#           define wxUSE_UXTHEME 0
-#       endif
-#   endif  /* wxUSE_UXTHEME */
-#   ifndef wxUSE_UXTHEME_AUTO
-#       ifdef wxABORT_ON_CONFIG_ERROR
-#           error "wxUSE_UXTHEME_AUTO must be defined."
-#       else
-#           define wxUSE_UXTHEME_AUTO 0
-#       endif
-#   endif  /* wxUSE_UXTHEME_AUTO */
-#   ifndef wxUSE_MS_HTML_HELP
-#       ifdef wxABORT_ON_CONFIG_ERROR
-#           error "wxUSE_MS_HTML_HELP must be defined."
-#       else
-#           define wxUSE_MS_HTML_HELP 0
-#       endif
-#   endif /* !defined(wxUSE_MS_HTML_HELP) */
-#   ifndef wxUSE_DIALUP_MANAGER
-#       ifdef wxABORT_ON_CONFIG_ERROR
-#           error "wxUSE_DIALUP_MANAGER must be defined."
-#       else
-#           define wxUSE_DIALUP_MANAGER 0
-#       endif
-#   endif /* !defined(wxUSE_DIALUP_MANAGER) */
-
-#   if !wxUSE_DYNAMIC_LOADER
-#       if wxUSE_MS_HTML_HELP
-#           ifdef wxABORT_ON_CONFIG_ERROR
-#               error "wxUSE_MS_HTML_HELP requires wxUSE_DYNAMIC_LOADER."
-#           else
-#               define wxUSE_DYNAMIC_LOADER 1
-#           endif
-#       endif
-#       if wxUSE_DIALUP_MANAGER
-#           ifdef wxABORT_ON_CONFIG_ERROR
-#               error "wxUSE_DIALUP_MANAGER requires wxUSE_DYNAMIC_LOADER."
-#           else
-#               define wxUSE_DYNAMIC_LOADER 1
-#           endif
-#       endif
-#   endif  /* wxUSE_DYNAMIC_LOADER */
-
-#endif /* wxMSW */
-
-/* wxMAC-specific dependencies */
-#ifdef __WXMAC__
-#   if wxUSE_UNICODE
-#       if !TARGET_CARBON
-#           ifdef wxABORT_ON_CONFIG_ERROR
-#               error "wxUSE_UNICODE is only supported for Carbon Targets."
-#           else
-#               define wxUSE_UNICODE 0
-#           endif
-#       endif
-#   endif
-#endif /* wxMAC */
-/* wxMotif-specific dependencies */
-#if defined(__WXMOTIF__) && wxUSE_NOTEBOOK && !wxUSE_TAB_DIALOG
-#  undef wxUSE_TAB_DIALOG
-#  define wxUSE_TAB_DIALOG 1
-#endif
-
-/* wxMGL-specific dependencies */
-#ifdef __WXMGL__
-#   if !wxUSE_PALETTE
-#       error "wxMGL requires wxUSE_PALETTE=1"
-#   endif
-#endif /* wxMGL */
-

 /* Hopefully we can emulate these dialogs in due course */
 #if defined(__SMARTPHONE__) && defined(__WXWINCE__)
 #   ifdef wxUSE_COLOURDLG
 /* Hopefully we can emulate these dialogs in due course */
 #if defined(__SMARTPHONE__) && defined(__WXWINCE__)
 #   ifdef wxUSE_COLOURDLG


@@ -1499,7 +1606,7 @@
 
 #   if !wxUSE_DOC_VIEW_ARCHITECTURE
 #        ifdef wxABORT_ON_CONFIG_ERROR
 
 #   if !wxUSE_DOC_VIEW_ARCHITECTURE
 #        ifdef wxABORT_ON_CONFIG_ERROR

-#            error "MDI requires wxUSE_DOC_VIEW_ARCHITECTURE"
+#            error "wxUSE_MDI_ARCHITECTURE requires wxUSE_DOC_VIEW_ARCHITECTURE"

 #        else
 #            undef wxUSE_DOC_VIEW_ARCHITECTURE
 #            define wxUSE_DOC_VIEW_ARCHITECTURE 1
 #        else
 #            undef wxUSE_DOC_VIEW_ARCHITECTURE
 #            define wxUSE_DOC_VIEW_ARCHITECTURE 1


@@ -1510,7 +1617,7 @@
 #if !wxUSE_FILEDLG
 #   if wxUSE_DOC_VIEW_ARCHITECTURE || wxUSE_WXHTML_HELP
 #       ifdef wxABORT_ON_CONFIG_ERROR
 #if !wxUSE_FILEDLG
 #   if wxUSE_DOC_VIEW_ARCHITECTURE || wxUSE_WXHTML_HELP
 #       ifdef wxABORT_ON_CONFIG_ERROR

-#           error "wxFileDialog must be compiled as well"
+#           error "wxUSE_FILEDLG is required by wxUSE_DOC_VIEW_ARCHITECTURE and wxUSE_WXHTML_HELP!"

 #       else
 #           undef wxUSE_FILEDLG
 #           define wxUSE_FILEDLG 1
 #       else
 #           undef wxUSE_FILEDLG
 #           define wxUSE_FILEDLG 1


@@ -1558,15 +1665,6 @@
 #            define wxUSE_TOOLBAR_NATIVE 0
 #        endif
 #   endif
 #            define wxUSE_TOOLBAR_NATIVE 0
 #        endif
 #   endif

-
-#   if wxUSE_TOOLBAR_SIMPLE
-#        ifdef wxABORT_ON_CONFIG_ERROR
-#            error "wxUSE_TOOLBAR is set to 0 but wxUSE_TOOLBAR_SIMPLE is set to 1"
-#        else
-#            undef wxUSE_TOOLBAR_SIMPLE
-#            define wxUSE_TOOLBAR_SIMPLE 0
-#        endif
-#   endif

 #endif
 
 #if !wxUSE_IMAGLIST
 #endif
 
 #if !wxUSE_IMAGLIST


@@ -1669,5 +1767,24 @@
 #   endif
 #endif /* wxUSE_SOCKETS */
 
 #   endif
 #endif /* wxUSE_SOCKETS */
 

-#endif /* wxUSE_GUI */
+#if !wxUSE_VARIANT
+#   if wxUSE_DATAVIEWCTRL
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxDataViewCtrl requires wxVariant"
+#       else
+#           undef wxUSE_DATAVIEWCTRL
+#           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 */