fix memory leak as Dimitri suggested

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

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 01ca99e4c59eebc1f6d6580707eeac72597f05eb..f6b3916ad26be6101ea205b71c2e3f0ce8d4e787 100644 (file)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -6,21 +6,211 @@
  * Created:     09.08.00
  * RCS-ID:      $Id$
  * Copyright:   (c) 2000 Vadim Zeitlin <vadim@wxwindows.org>
  * Created:     09.08.00
  * RCS-ID:      $Id$
  * Copyright:   (c) 2000 Vadim Zeitlin <vadim@wxwindows.org>

- * Licence:     wxWindows license
+ * 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 */
 
 /*

-   this global setting determintes what should we do if the setting FOO
+   this global setting determines what should we do if the setting FOO

    requires BAR and BAR is not set: we can either silently define BAR
    (default, recommended) or give an error and abort (mainly useful for
    requires BAR and BAR is not set: we can either silently define BAR
    (default, recommended) or give an error and abort (mainly useful for

-   developpers only)
+   developers only)

  */
 #define wxABORT_ON_CONFIG_ERROR
 
 /*
  */
 #define wxABORT_ON_CONFIG_ERROR
 
 /*

-   all these tests are for GUI onlu
+   global features
+ */
+
+/* GUI build by default */
+#if !defined(wxUSE_GUI)
+#   define wxUSE_GUI 1
+#endif /* !defined(wxUSE_GUI) */
+
+/* wxBase doesn't need compatibility settings as it's a new port */
+#if !wxUSE_GUI
+#   undef WXWIN_COMPATIBILITY
+#   undef WXWIN_COMPATIBILITY_2
+#   undef WXWIN_COMPATIBILITY_2_2
+#   define WXWIN_COMPATIBILITY 0
+#   define WXWIN_COMPATIBILITY_2 0
+#   define WXWIN_COMPATIBILITY_2_2 0
+#endif /* !wxUSE_GUI */
+
+/*
+   tests for non GUI features
+ */
+
+#ifndef wxUSE_DYNLIB_CLASS
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_DYNLIB_CLASS must be defined."
+#   else
+#       define wxUSE_DYNLIB_CLASS 0
+#   endif
+#endif /* !defined(wxUSE_DYNLIB_CLASS) */
+
+#ifndef wxUSE_FILESYSTEM
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_FILESYSTEM must be defined."
+#   else
+#       define wxUSE_FILESYSTEM 0
+#   endif
+#endif /* !defined(wxUSE_FILESYSTEM) */
+
+/* don't give an error about this one yet, it's not fully implemented */
+#ifndef wxUSE_FSVOLUME
+#   define wxUSE_FSVOLUME 0
+#endif /* !defined(wxUSE_FSVOLUME) */
+
+#ifndef wxUSE_DYNAMIC_LOADER
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_DYNAMIC_LOADER must be defined."
+#   else
+#       define wxUSE_DYNAMIC_LOADER 0
+#   endif
+#endif /* !defined(wxUSE_DYNAMIC_LOADER) */
+
+#ifndef wxUSE_LOG
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_LOG must be defined."
+#   else
+#       define wxUSE_LOG 0
+#   endif
+#endif /* !defined(wxUSE_LOG) */
+
+#ifndef wxUSE_LONGLONG
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_LONGLONG must be defined."
+#   else
+#       define wxUSE_LONGLONG 0
+#   endif
+#endif /* !defined(wxUSE_LONGLONG) */
+
+#ifndef wxUSE_MIMETYPE
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_MIMETYPE must be defined."
+#   else
+#       define wxUSE_MIMETYPE 0
+#   endif
+#endif /* !defined(wxUSE_MIMETYPE) */
+
+#ifndef wxUSE_PROLOGIO
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_PROLOGIO must be defined."
+#   else
+#       define wxUSE_PROLOGIO 0
+#   endif
+#endif /* !defined(wxUSE_PROLOGIO) */
+
+#ifndef wxUSE_PROTOCOL
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_PROTOCOL must be defined."
+#   else
+#       define wxUSE_PROTOCOL 0
+#   endif
+#endif /* !defined(wxUSE_PROTOCOL) */
+
+/* we may not define wxUSE_PROTOCOL_XXX if wxUSE_PROTOCOL is set to 0 */
+#if !wxUSE_PROTOCOL
+#   undef wxUSE_PROTOCOL_HTTP
+#   undef wxUSE_PROTOCOL_FTP
+#   undef wxUSE_PROTOCOL_FILE
+#   define wxUSE_PROTOCOL_HTTP 0
+#   define wxUSE_PROTOCOL_FTP 0
+#   define wxUSE_PROTOCOL_FILE 0
+#endif /* wxUSE_PROTOCOL */
+
+#ifndef wxUSE_PROTOCOL_HTTP
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_PROTOCOL_HTTP must be defined."
+#   else
+#       define wxUSE_PROTOCOL_HTTP 0
+#   endif
+#endif /* !defined(wxUSE_PROTOCOL_HTTP) */
+
+#ifndef wxUSE_PROTOCOL_FTP
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_PROTOCOL_FTP must be defined."
+#   else
+#       define wxUSE_PROTOCOL_FTP 0
+#   endif
+#endif /* !defined(wxUSE_PROTOCOL_FTP) */
+
+#ifndef wxUSE_PROTOCOL_FILE
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_PROTOCOL_FILE must be defined."
+#   else
+#       define wxUSE_PROTOCOL_FILE 0
+#   endif
+#endif /* !defined(wxUSE_PROTOCOL_FILE) */
+
+#ifndef wxUSE_REGEX
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_REGEX must be defined."
+#   else
+#       define wxUSE_REGEX 0
+#   endif
+#endif /* !defined(wxUSE_REGEX) */
+
+#ifndef wxUSE_SOCKETS
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_SOCKETS must be defined."
+#   else
+#       define wxUSE_SOCKETS 0
+#   endif
+#endif /* !defined(wxUSE_SOCKETS) */
+
+#ifndef wxUSE_STREAMS
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_STREAMS must be defined."
+#   else
+#       define wxUSE_STREAMS 0
+#   endif
+#endif /* !defined(wxUSE_STREAMS) */
+
+#ifndef wxUSE_STOPWATCH
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_STOPWATCH must be defined."
+#   else
+#       define wxUSE_STOPWATCH 0
+#   endif
+#endif /* !defined(wxUSE_STOPWATCH) */
+
+#ifndef wxUSE_TEXTBUFFER
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_TEXTBUFFER must be defined."
+#   else
+#       define wxUSE_TEXTBUFFER 0
+#   endif
+#endif /* !defined(wxUSE_TEXTBUFFER) */
+
+#ifndef wxUSE_TEXTFILE
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_TEXTFILE must be defined."
+#   else
+#       define wxUSE_TEXTFILE 0
+#   endif
+#endif /* !defined(wxUSE_TEXTFILE) */
+
+#ifndef wxUSE_UNICODE
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_UNICODE must be defined."
+#   else
+#       define wxUSE_UNICODE 0
+#   endif
+#endif /* !defined(wxUSE_UNICODE) */
+
+#ifndef wxUSE_URL
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_URL must be defined."
+#   else
+#       define wxUSE_URL 0
+#   endif
+#endif /* !defined(wxUSE_URL) */
+
+/*
+   all these tests are for GUI only

  */
 #if wxUSE_GUI
 
  */
 #if wxUSE_GUI
 


@@ -197,6 +387,22 @@
 #   endif
 #endif /* !defined(wxUSE_HTML) */
 
 #   endif
 #endif /* !defined(wxUSE_HTML) */
 

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

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


@@ -205,6 +411,14 @@
 #   endif
 #endif /* !defined(wxUSE_IMAGLIST) */
 
 #   endif
 #endif /* !defined(wxUSE_IMAGLIST) */
 

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

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


@@ -221,14 +435,6 @@
 #   endif
 #endif /* !defined(wxUSE_LISTCTRL) */
 
 #   endif
 #endif /* !defined(wxUSE_LISTCTRL) */
 

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

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


@@ -245,8 +451,6 @@
 #   endif
 #endif /* !defined(wxUSE_LOGWINDOW) */
 
 #   endif
 #endif /* !defined(wxUSE_LOGWINDOW) */
 

-/* For now... */
-#ifndef __WXGTK__

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


@@ -254,7 +458,6 @@
 #       define wxUSE_LOG_DIALOG 0
 #   endif
 #endif /* !defined(wxUSE_LOG_DIALOG) */
 #       define wxUSE_LOG_DIALOG 0
 #   endif
 #endif /* !defined(wxUSE_LOG_DIALOG) */

-#endif

 
 #ifndef wxUSE_MDI_ARCHITECTURE
 #   ifdef wxABORT_ON_CONFIG_ERROR
 
 #ifndef wxUSE_MDI_ARCHITECTURE
 #   ifdef wxABORT_ON_CONFIG_ERROR


@@ -272,14 +475,6 @@
 #   endif
 #endif /* !defined(wxUSE_MENUS) */
 
 #   endif
 #endif /* !defined(wxUSE_MENUS) */
 

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

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


@@ -304,6 +499,14 @@
 #   endif
 #endif /* !defined(wxUSE_NOTEBOOK) */
 
 #   endif
 #endif /* !defined(wxUSE_NOTEBOOK) */
 

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

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


@@ -336,14 +539,6 @@
 #   endif
 #endif /* !defined(wxUSE_RADIOBTN) */
 
 #   endif
 #endif /* !defined(wxUSE_RADIOBTN) */
 

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

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


@@ -384,6 +579,14 @@
 #   endif
 #endif /* !defined(wxUSE_SPINCTRL) */
 
 #   endif
 #endif /* !defined(wxUSE_SPINCTRL) */
 

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

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


@@ -432,14 +635,6 @@
 #   endif
 #endif /* !defined(wxUSE_STATUSBAR) */
 
 #   endif
 #endif /* !defined(wxUSE_STATUSBAR) */
 

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

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


@@ -456,6 +651,14 @@
 #   endif
 #endif /* !defined(wxUSE_TEXTCTRL) */
 
 #   endif
 #endif /* !defined(wxUSE_TEXTCTRL) */
 

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

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


@@ -480,6 +683,14 @@
 #   endif
 #endif /* !defined(wxUSE_TREECTRL) */
 
 #   endif
 #endif /* !defined(wxUSE_TREECTRL) */
 

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

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


@@ -488,9 +699,139 @@
 #   endif
 #endif /* !defined(wxUSE_WXHTML_HELP) */
 
 #   endif
 #endif /* !defined(wxUSE_WXHTML_HELP) */
 

+#endif /* wxUSE_GUI */
+

 /*
    check consistency of the settings
  */
 /*
    check consistency of the settings
  */

+
+#if wxUSE_PROTOCOL_FILE || wxUSE_PROTOCOL_FTP || wxUSE_PROTOCOL_HTTP
+#   if !wxUSE_PROTOCOL
+#        ifdef wxABORT_ON_CONFIG_ERROR
+#            error "wxUSE_PROTOCOL_XXX requires wxUSE_PROTOCOL"
+#        else
+#            undef wxUSE_PROTOCOL
+#            define wxUSE_PROTOCOL 1
+#        endif
+#   endif
+#endif /* wxUSE_PROTOCOL_XXX */
+
+#if wxUSE_URL
+#   if !wxUSE_PROTOCOL
+#        ifdef wxABORT_ON_CONFIG_ERROR
+#            error "wxUSE_URL requires wxUSE_PROTOCOL"
+#        else
+#            undef wxUSE_PROTOCOL
+#            define wxUSE_PROTOCOL 1
+#        endif
+#   endif
+#endif /* wxUSE_URL */
+
+#if wxUSE_PROTOCOL
+#   if !wxUSE_SOCKETS
+#       if wxUSE_PROTOCOL_HTTP || wxUSE_PROTOCOL_FTP
+#           ifdef wxABORT_ON_CONFIG_ERROR
+#               error "wxUSE_PROTOCOL_FTP/HTTP requires wxUSE_SOCKETS"
+#           else
+#               undef wxUSE_SOCKETS
+#               define wxUSE_SOCKETS 1
+#           endif
+#       endif
+#   endif
+
+#   if !wxUSE_STREAMS
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxUSE_PROTOCOL requires wxUSE_STREAMS"
+#       else
+#           undef wxUSE_STREAMS
+#           define wxUSE_STREAMS 1
+#       endif
+#   endif
+#endif /* wxUSE_PROTOCOL */
+
+/* have to test for wxUSE_HTML before wxUSE_FILESYSTEM */
+#if wxUSE_HTML
+#   if !wxUSE_FILESYSTEM
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxHTML requires wxFileSystem"
+#       else
+#           undef wxUSE_FILESYSTEM
+#           define wxUSE_FILESYSTEM 1
+#       endif
+#   endif
+#endif /* wxUSE_HTML */
+
+#if wxUSE_FILESYSTEM
+#   if !wxUSE_STREAMS
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxUSE_FILESYSTEM requires wxUSE_STREAMS"
+#       else
+#           undef wxUSE_STREAMS
+#           define wxUSE_STREAMS 1
+#       endif
+#   endif
+#endif /* wxUSE_FILESYSTEM */
+
+#if wxUSE_STOPWATCH || wxUSE_DATETIME
+#    if !wxUSE_LONGLONG
+#        ifdef wxABORT_ON_CONFIG_ERROR
+#            error "wxUSE_STOPWATCH and wxUSE_DATETIME require wxUSE_LONGLONG"
+#        else
+#            undef wxUSE_LONGLONG
+#            define wxUSE_LONGLONG 1
+#        endif
+#    endif
+#endif /* wxUSE_STOPWATCH */
+
+#if wxUSE_MIMETYPE && !wxUSE_TEXTFILE
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_MIMETYPE requires wxUSE_TEXTFILE"
+#   else
+#       undef wxUSE_TEXTFILE
+#       define wxUSE_TEXTFILE 1
+#   endif
+#endif /* wxUSE_MIMETYPE */
+
+#if wxUSE_TEXTFILE && !wxUSE_TEXTBUFFER
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_TEXTFILE requires wxUSE_TEXTBUFFER"
+#   else
+#       undef wxUSE_TEXTBUFFER
+#       define wxUSE_TEXTBUFFER 1
+#   endif
+#endif /* wxUSE_TEXTFILE */
+
+#if wxUSE_TEXTFILE && !wxUSE_FILE
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_TEXTFILE requires wxUSE_FILE"
+#   else
+#       undef wxUSE_FILE
+#       define wxUSE_FILE 1
+#   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 */
+
+#if wxUSE_ODBC && wxUSE_UNICODE
+#   ifdef wxABORT_ON_CONFIG_ERROR
+        /* (ODBC classes aren't Unicode-compatible yet) */
+#       error "wxUSE_ODBC can't be used with wxUSE_UNICODE"
+#   else
+#       undef wxUSE_ODBC
+#       define wxUSE_ODBC 0
+#   endif
+#endif /* wxUSE_ODBC */
+
+/* the rest of the tests is for the GUI settings only */
+#if wxUSE_GUI
+

 #if wxUSE_BUTTON || \
     wxUSE_CALENDARCTRL || \
     wxUSE_CARET || \
 #if wxUSE_BUTTON || \
     wxUSE_CALENDARCTRL || \
     wxUSE_CARET || \


@@ -584,26 +925,84 @@
 #endif /* __WXUNIVERSAL__ */
 
 /* wxGTK-specific dependencies */
 #endif /* __WXUNIVERSAL__ */
 
 /* wxGTK-specific dependencies */

-#if defined(__WXGTK__) && !defined(__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
+#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 */
 
 #       endif
 #   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_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 */
+

 /* wxMotif-specific dependencies */
 #if defined(__WXMOTIF__) && wxUSE_NOTEBOOK && !wxUSE_TAB_DIALOG
 #  undef wxUSE_TAB_DIALOG
 #  define wxUSE_TAB_DIALOG 1
 #endif
 /* wxMotif-specific dependencies */
 #if defined(__WXMOTIF__) && wxUSE_NOTEBOOK && !wxUSE_TAB_DIALOG
 #  undef wxUSE_TAB_DIALOG
 #  define wxUSE_TAB_DIALOG 1
 #endif

-#if defined(__WXMOTIF__) && wxUSE_TOGGLEBTN
-#  undef wxUSE_TOGGLEBTN
-#  define wxUSE_TOGGLEBTN 0
-#endif
+
+/* wxMGL-specific dependencies */
+#ifdef __WXMGL__
+#   if !wxUSE_PALETTE
+#       error "wxMGL requires wxUSE_PALETTE=1"
+#   endif
+#endif /* wxMGL */

 
 /* generic controls dependencies */
 #if !defined(__WXMSW__) || defined(__WXUNIVERSAL__)
 
 /* generic controls dependencies */
 #if !defined(__WXMSW__) || defined(__WXUNIVERSAL__)


@@ -644,6 +1043,15 @@
 #           define wxUSE_COMBOBOX 1
 #       endif
 #   endif
 #           define wxUSE_COMBOBOX 1
 #       endif
 #   endif

+
+#   if !wxUSE_DATETIME
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxCalendarCtrl requires wxUSE_DATETIME"
+#       else
+#           undef wxUSE_DATETIME
+#           define wxUSE_DATETIME 1
+#       endif
+#   endif

 #endif /* wxUSE_CALENDARCTRL */
 
 #if wxUSE_CHECKLISTBOX
 #endif /* wxUSE_CALENDARCTRL */
 
 #if wxUSE_CHECKLISTBOX


@@ -658,7 +1066,7 @@
 #endif /* wxUSE_RADIOBTN */
 
 #if wxUSE_WXHTML_HELP
 #endif /* wxUSE_RADIOBTN */
 
 #if wxUSE_WXHTML_HELP

-#   if !wxUSE_HELP || !wxUSE_HTML || !wxUSE_COMBOBOX
+#   if !wxUSE_HELP || !wxUSE_HTML || !wxUSE_COMBOBOX || !wxUSE_NOTEBOOK

 #       ifdef wxABORT_ON_CONFIG_ERROR
 #           error "Built in help controller can't be compiled"
 #       else
 #       ifdef wxABORT_ON_CONFIG_ERROR
 #           error "Built in help controller can't be compiled"
 #       else


@@ -668,10 +1076,32 @@
 #           define wxUSE_HTML 1
 #           undef wxUSE_COMBOBOX
 #           define wxUSE_COMBOBOX 1
 #           define wxUSE_HTML 1
 #           undef wxUSE_COMBOBOX
 #           define wxUSE_COMBOBOX 1

+#           undef wxUSE_NOTEBOOK
+#           define wxUSE_NOTEBOOK 1

 #       endif
 #   endif
 #endif /* wxUSE_WXHTML_HELP */
 
 #       endif
 #   endif
 #endif /* wxUSE_WXHTML_HELP */
 

+#if wxUSE_DOC_VIEW_ARCHITECTURE
+#   if !wxUSE_MENUS
+#        ifdef wxABORT_ON_CONFIG_ERROR
+#            error "DocView requires wxUSE_MENUS"
+#        else
+#            undef wxUSE_MENUS
+#            define wxUSE_MENUS 1
+#        endif
+#   endif
+
+#   if !wxUSE_STREAMS && !wxUSE_STD_IOSTREAM
+#        ifdef wxABORT_ON_CONFIG_ERROR
+#            error "DocView requires wxUSE_STREAMS or wxUSE_STD_IOSTREAM"
+#        else
+#            undef wxUSE_STREAMS
+#            define wxUSE_STREAMS 1
+#        endif
+#   endif
+#endif /* wxUSE_DOC_VIEW_ARCHITECTURE */
+

 #if wxUSE_PRINTING_ARCHITECTURE
 #   if !wxUSE_COMBOBOX
 #       ifdef wxABORT_ON_CONFIG_ERROR
 #if wxUSE_PRINTING_ARCHITECTURE
 #   if !wxUSE_COMBOBOX
 #       ifdef wxABORT_ON_CONFIG_ERROR


@@ -681,21 +1111,30 @@
 #           define wxUSE_COMBOBOX 1
 #       endif
 #   endif
 #           define wxUSE_COMBOBOX 1
 #       endif
 #   endif

+
+#   if !wxUSE_DOC_VIEW_ARCHITECTURE
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "Print architecture requires wxUSE_DOC_VIEW_ARCHITECTURE"
+#       else
+#           undef wxUSE_DOC_VIEW_ARCHITECTURE
+#           define wxUSE_DOC_VIEW_ARCHITECTURE 1
+#       endif
+#   endif

 #endif /* wxUSE_PRINTING_ARCHITECTURE */
 
 #endif /* wxUSE_PRINTING_ARCHITECTURE */
 

-#if wxUSE_DOC_VIEW_ARCHITECTURE
-#   if !wxUSE_MENUS
+#if wxUSE_MDI_ARCHITECTURE
+#   if !wxUSE_DOC_VIEW_ARCHITECTURE

 #        ifdef wxABORT_ON_CONFIG_ERROR
 #        ifdef wxABORT_ON_CONFIG_ERROR

-#            error "DocView requires wxUSE_MENUS"
+#            error "MDI requires wxUSE_DOC_VIEW_ARCHITECTURE"

 #        else
 #        else

-#            undef wxUSE_MENUS
-#            define wxUSE_MENUS 1
+#            undef wxUSE_DOC_VIEW_ARCHITECTURE
+#            define wxUSE_DOC_VIEW_ARCHITECTURE 1

 #        endif
 #   endif
 #        endif
 #   endif

-#endif /* wxUSE_DOC_VIEW_ARCHITECTURE */
+#endif /* wxUSE_MDI_ARCHITECTURE */

 
 #if !wxUSE_FILEDLG
 
 #if !wxUSE_FILEDLG

-#   if wxUSE_DOC_VIEW_ARCHITECTURE || wxUSE_HTML
+#   if wxUSE_DOC_VIEW_ARCHITECTURE || wxUSE_WXHTML_HELP

 #       ifdef wxABORT_ON_CONFIG_ERROR
 #           error "wxFileDialog must be compiled as well"
 #       else
 #       ifdef wxABORT_ON_CONFIG_ERROR
 #           error "wxFileDialog must be compiled as well"
 #       else


@@ -739,17 +1178,6 @@
 #   endif
 #endif /* wxUSE_RADIOBOX */
 
 #   endif
 #endif /* wxUSE_RADIOBOX */
 

-#if wxUSE_STOPWATCH
-#    if !wxUSE_LONGLONG
-#        ifdef wxABORT_ON_CONFIG_ERROR
-#            error "wxUSE_STOPWATCH requires wxUSE_LONGLONG"
-#        else
-#            undef wxUSE_LONGLONG
-#            define wxUSE_LONGLONG 1
-#        endif
-#    endif
-#endif /* wxUSE_STOPWATCH */
-

 #if wxUSE_LOGWINDOW
 #    if !wxUSE_TEXTCTRL
 #        ifdef wxABORT_ON_CONFIG_ERROR
 #if wxUSE_LOGWINDOW
 #    if !wxUSE_TEXTCTRL
 #        ifdef wxABORT_ON_CONFIG_ERROR


@@ -779,28 +1207,10 @@
 #       error "wxUSE_DYNAMIC_CLASSES must be defined as 1"
 #   else
 #       undef wxUSE_DYNAMIC_CLASSES
 #       error "wxUSE_DYNAMIC_CLASSES must be defined as 1"
 #   else
 #       undef wxUSE_DYNAMIC_CLASSES

-#       define wxUSE_DYNAMIC_CLASSES
+#       define wxUSE_DYNAMIC_CLASSES 1

 #   endif
 #endif /* wxUSE_DYNAMIC_CLASSES */
 
 #   endif
 #endif /* wxUSE_DYNAMIC_CLASSES */
 

-#if wxUSE_MIMETYPE && !wxUSE_TEXTFILE
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_MIMETYPE requires wxUSE_TEXTFILE"
-#   else
-#       undef wxUSE_TEXTFILE
-#       define wxUSE_TEXTFILE 1
-#   endif
-#endif /* wxUSE_MIMETYPE */
-
-#if wxUSE_TEXTFILE && !wxUSE_FILE
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_TEXTFILE requires wxUSE_FILE"
-#   else
-#       undef wxUSE_FILE
-#       define wxUSE_FILE 1
-#   endif
-#endif /* wxUSE_TEXTFILE */
-

 #if wxUSE_CLIPBOARD && !wxUSE_DATAOBJ
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxClipboard requires wxDataObject"
 #if wxUSE_CLIPBOARD && !wxUSE_DATAOBJ
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxClipboard requires wxDataObject"


@@ -810,5 +1220,14 @@
 #   endif
 #endif /* wxUSE_CLIPBOARD */
 
 #   endif
 #endif /* wxUSE_CLIPBOARD */
 

+#if wxUSE_WX_RESOURCES && !wxUSE_PROLOGIO
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxr resources require PrologIO"
+#   else
+#       undef wxUSE_PROLOGIO
+#       define wxUSE_PROLOGIO 1
+#   endif
+#endif /* wxUSE_WX_RESOURCES */
+

 #endif /* wxUSE_GUI */
 
 #endif /* wxUSE_GUI */