More work on getting wxLisBox events right

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

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 34ee4789e97edea85e466450b113f9cd6d4795ef..8d36d10b0cf9e6e30e0c7610065f87ca5db82989 100644 (file)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -10,35 +10,20 @@
  */
 
 /* 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 */

+#ifndef _WX_CHKCONF_H_
+#define _WX_CHKCONF_H_

 
 /*
 
 /*

-   Platform-specific checking.
+   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

  */
 
  */
 

-#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 __WXUNIVERSAL__
-#   include "wx/univ/chkconf.h"
-#endif
-

 /*
    this global setting determines what should we do if the setting FOO
    requires BAR and BAR is not set: we can either silently unset FOO as well
 /*
    this global setting determines what should we do if the setting FOO
    requires BAR and BAR is not set: we can either silently unset FOO as well


@@ -78,28 +63,18 @@
 
 
 /*
 
 
 /*

-   tests for non GUI features
+   Section 1a: tests for non GUI features.

 
    please keep the options in alphabetical order!
  */
 
 
    please keep the options in alphabetical order!
  */
 

-#ifndef wxUSE_BACKINGFILE
+#ifndef wxUSE_CONSOLE_EVENTLOOP

 #   ifdef wxABORT_ON_CONFIG_ERROR
 #   ifdef wxABORT_ON_CONFIG_ERROR

-#       error "wxUSE_BACKINGFILE must be defined."
+#       error "wxUSE_CONSOLE_EVENTLOOP must be defined."

 #   else
 #   else

-#       define wxUSE_BACKINGFILE 0
+#       define wxUSE_CONSOLE_EVENTLOOP 0

 #   endif
 #   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) */
+#endif /* !defined(wxUSE_CONSOLE_EVENTLOOP) */

 
 #ifndef wxUSE_DYNLIB_CLASS
 #   ifdef wxABORT_ON_CONFIG_ERROR
 
 #ifndef wxUSE_DYNLIB_CLASS
 #   ifdef wxABORT_ON_CONFIG_ERROR


@@ -125,6 +100,14 @@
 #   endif
 #endif /* !defined(wxUSE_FILESYSTEM) */
 
 #   endif
 #endif /* !defined(wxUSE_FILESYSTEM) */
 

+#ifndef wxUSE_FS_ARCHIVE
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_FS_ARCHIVE must be defined."
+#   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
 /* don't give an error about this one yet, it's not fully implemented */
 #ifndef wxUSE_FSVOLUME
 #   define wxUSE_FSVOLUME 0


@@ -138,6 +121,14 @@
 #   endif
 #endif /* !defined(wxUSE_DYNAMIC_LOADER) */
 
 #   endif
 #endif /* !defined(wxUSE_DYNAMIC_LOADER) */
 

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

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


@@ -308,8 +299,24 @@
 #   endif
 #endif /* wxUSE_VARIANT */
 
 #   endif
 #endif /* wxUSE_VARIANT */
 

+#ifndef wxUSE_WEAKREF
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_WEAKREF must be defined."
+#   else
+#       define wxUSE_WEAKREF 0
+#   endif
+#endif /* wxUSE_WEAKREF */
+
+#ifndef wxUSE_XLOCALE
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_XLOCALE must be defined."
+#   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!
  */
 
    please keep the options in alphabetical order!
  */


@@ -336,6 +343,14 @@
 #   endif
 #endif /* !defined(wxUSE_ACCEL) */
 
 #   endif
 #endif /* !defined(wxUSE_ACCEL) */
 

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

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


@@ -344,6 +359,14 @@
 #   endif
 #endif /* !defined(wxUSE_ANIMATIONCTRL) */
 
 #   endif
 #endif /* !defined(wxUSE_ANIMATIONCTRL) */
 

+#ifndef wxUSE_AUTOID_MANAGEMENT
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_AUTOID_MANAGEMENT must be defined."
+#   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."
 #ifndef wxUSE_BITMAPCOMBOBOX
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_BITMAPCOMBOBOX must be defined."


@@ -432,6 +455,14 @@
 #   endif
 #endif /* !defined(wxUSE_CLIPBOARD) */
 
 #   endif
 #endif /* !defined(wxUSE_CLIPBOARD) */
 

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

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


@@ -512,6 +543,14 @@
 #   endif
 #endif /* !defined(wxUSE_DOC_VIEW_ARCHITECTURE) */
 
 #   endif
 #endif /* !defined(wxUSE_DOC_VIEW_ARCHITECTURE) */
 

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

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


@@ -602,7 +641,7 @@
 #endif /* !defined(wxUSE_HTML) */
 
 #ifndef wxUSE_LIBMSPACK
 #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
         /* set to 0 on platforms that don't have libmspack */
 #       define wxUSE_LIBMSPACK 0
 #   else


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

+#ifndef wxUSE_NOTIFICATION_MESSAGE
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_NOTIFICATION_MESSAGE must be defined."
+#   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."
 #ifndef wxUSE_ODCOMBOBOX
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_ODCOMBOBOX must be defined."


@@ -894,6 +941,14 @@
 #   endif
 #endif /* !defined(wxUSE_TAB_DIALOG) */
 
 #   endif
 #endif /* !defined(wxUSE_TAB_DIALOG) */
 

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

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


@@ -961,19 +1016,60 @@
 #endif /* wxUSE_GUI */
 
 /*
 #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(__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
+
+/*
+    __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

 
 

-#if WXWIN_COMPATIBILITY_2_4
-#   if !WXWIN_COMPATIBILITY_2_6
+/*
+   Section 3a: check consistency of the non-GUI settings.
+ */
+
+#if WXWIN_COMPATIBILITY_2_6
+#   if !WXWIN_COMPATIBILITY_2_8

 #       ifdef wxABORT_ON_CONFIG_ERROR
 #       ifdef wxABORT_ON_CONFIG_ERROR

-#           error "2.4.X compatibility requires 2.6.X compatibility"
+#           error "2.6.X compatibility requires 2.8.X compatibility"

 #       else
 #       else

-#           undef WXWIN_COMPATIBILITY_2_6
-#           define WXWIN_COMPATIBILITY_2_6 1
+#           undef WXWIN_COMPATIBILITY_2_8
+#           define WXWIN_COMPATIBILITY_2_8 1

 #       endif
 #   endif
 #       endif
 #   endif

-#endif /* WXWIN_COMPATIBILITY_2_4 */
+#endif /* WXWIN_COMPATIBILITY_2_6 */

 
 #if wxUSE_ARCHIVE_STREAMS
 #   if !wxUSE_DATETIME
 
 #if wxUSE_ARCHIVE_STREAMS
 #   if !wxUSE_DATETIME


@@ -986,15 +1082,6 @@
 #   endif
 #endif /* wxUSE_ARCHIVE_STREAMS */
 
 #   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


@@ -1051,6 +1138,25 @@
 #   endif
 #endif /* wxUSE_HTML */
 
 #   endif
 #endif /* wxUSE_HTML */
 

+#if wxUSE_FS_ARCHIVE
+#   if !wxUSE_FILESYSTEM
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxArchiveFSHandler requires wxFileSystem"
+#       else
+#           undef wxUSE_FILESYSTEM
+#           define wxUSE_FILESYSTEM 1
+#       endif
+#   endif
+#   if !wxUSE_ARCHIVE_STREAMS
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxArchiveFSHandler requires wxArchive"
+#       else
+#           undef wxUSE_ARCHIVE_STREAMS
+#           define wxUSE_ARCHIVE_STREAMS 1
+#       endif
+#   endif
+#endif /* wxUSE_FS_ARCHIVE */
+

 #if wxUSE_FILESYSTEM
 #   if !wxUSE_STREAMS
 #       ifdef wxABORT_ON_CONFIG_ERROR
 #if wxUSE_FILESYSTEM
 #   if !wxUSE_STREAMS
 #       ifdef wxABORT_ON_CONFIG_ERROR


@@ -1064,8 +1170,10 @@
 #       ifdef wxABORT_ON_CONFIG_ERROR
 #           error "wxUSE_FILESYSTEM requires either wxUSE_FILE or wxUSE_FFILE"
 #       else
 #       ifdef wxABORT_ON_CONFIG_ERROR
 #           error "wxUSE_FILESYSTEM requires either wxUSE_FILE or wxUSE_FFILE"
 #       else

-#           undef wxUSE_FILESYSTEM
-#           define wxUSE_FILESYSTEM 0
+#           undef wxUSE_FILE
+#           define wxUSE_FILE 1
+#           undef wxUSE_FFILE
+#           define wxUSE_FFILE 1

 #       endif
 #   endif
 #endif /* wxUSE_FILESYSTEM */
 #       endif
 #   endif
 #endif /* wxUSE_FILESYSTEM */


@@ -1101,17 +1209,6 @@
 #   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"


@@ -1168,20 +1265,31 @@
 #   endif
 #endif /* wxUSE_ZIPSTREAM */
 
 #   endif
 #endif /* wxUSE_ZIPSTREAM */
 

-#if wxUSE_BACKINGFILE
-#   if !wxUSE_STREAMS || (!wxUSE_FILE && !wxUSE_FFILE)
+#if wxUSE_TARSTREAM
+#   if !wxUSE_ARCHIVE_STREAMS

 #       ifdef wxABORT_ON_CONFIG_ERROR
 #       ifdef wxABORT_ON_CONFIG_ERROR

-#           error "wxBackingFile requires wxStream and wxFile or wxFFile"
+#           error "wxTar requires wxArchive"

 #       else
 #       else

-#           undef wxUSE_BACKINGFILE
-#           define wxUSE_BACKINGFILE 0
+#           undef wxUSE_ARCHIVE_STREAMS
+#           define wxUSE_ARCHIVE_STREAMS 1

 #       endif
 #   endif
 #       endif
 #   endif

-#endif /* wxUSE_BACKINGFILE */
+#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_GUI
 

+#if wxUSE_ACCESSIBILITY && !defined(__WXMSW__)
+#   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 || \
 #if wxUSE_BUTTON || \
     wxUSE_CALENDARCTRL || \
     wxUSE_CARET || \


@@ -1245,8 +1353,20 @@
 #define wxUSE_BOOKCTRL (wxUSE_NOTEBOOK || \
                         wxUSE_LISTBOOK || \
                         wxUSE_CHOICEBOOK || \
 #define wxUSE_BOOKCTRL (wxUSE_NOTEBOOK || \
                         wxUSE_LISTBOOK || \
                         wxUSE_CHOICEBOOK || \

+                        wxUSE_TOOLBOOK || \

                         wxUSE_TREEBOOK)
 
                         wxUSE_TREEBOOK)
 

+#if wxUSE_COLLPANE
+#   if !wxUSE_BUTTON || !wxUSE_STATLINE
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxUSE_COLLPANE requires wxUSE_BUTTON and wxUSE_STATLINE"
+#       else
+#           undef wxUSE_COLLPANE
+#           define wxUSE_COLLPANE 0
+#       endif
+#   endif
+#endif /* wxUSE_COLLPANE */
+

 #if wxUSE_LISTBOOK
 #   if !wxUSE_LISTCTRL
 #       ifdef wxABORT_ON_CONFIG_ERROR
 #if wxUSE_LISTBOOK
 #   if !wxUSE_LISTCTRL
 #       ifdef wxABORT_ON_CONFIG_ERROR


@@ -1269,6 +1389,17 @@
 #   endif
 #endif /* wxUSE_CHOICEBOOK */
 
 #   endif
 #endif /* wxUSE_CHOICEBOOK */
 

+#if wxUSE_TOOLBOOK
+#   if !wxUSE_TOOLBAR
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxToolbook requires wxToolBar"
+#       else
+#           undef wxUSE_TOOLBAR
+#           define wxUSE_TOOLBAR 1
+#       endif
+#   endif
+#endif /* wxUSE_TOOLBOOK */
+

 #if !wxUSE_ODCOMBOBOX
 #   if wxUSE_BITMAPCOMBOBOX
 #       error "wxBitmapComboBox requires wxOwnerDrawnComboBox"
 #if !wxUSE_ODCOMBOBOX
 #   if wxUSE_BITMAPCOMBOBOX
 #       error "wxBitmapComboBox requires wxOwnerDrawnComboBox"


@@ -1300,40 +1431,6 @@
 #endif /* wxUSE_GRAPHICS_CONTEXT */
 
 
 #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
 /* generic controls dependencies */
 #if !defined(__WXMSW__) || defined(__WXUNIVERSAL__)
 #   if wxUSE_FONTDLG || wxUSE_FILEDLG || wxUSE_CHOICEDLG


@@ -1361,6 +1458,17 @@
 #   endif
 #endif /* !wxMSW || wxUniv */
 
 #   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)
 /* common dependencies */
 #if wxUSE_CALENDARCTRL
 #   if !(wxUSE_SPINBTN && wxUSE_COMBOBOX)


@@ -1437,6 +1545,18 @@
 #   endif
 #endif /* wxUSE_HELP */
 
 #   endif
 #endif /* wxUSE_HELP */
 

+#if wxUSE_MS_HTML_HELP
+    /*
+        this doesn't make sense for platforms other than MSW but we still
+        define it in wx/setup_inc.h so don't complain if it happens to be
+        defined under another platform but just silently fix it.
+     */
+#   ifndef __WXMSW__
+#       undef wxUSE_MS_HTML_HELP
+#       define wxUSE_MS_HTML_HELP 0
+#   endif
+#endif /* wxUSE_MS_HTML_HELP */
+

 #if wxUSE_WXHTML_HELP
 #   if !wxUSE_HELP || !wxUSE_HTML || !wxUSE_COMBOBOX || !wxUSE_NOTEBOOK || !wxUSE_SPINCTRL
 #       ifdef wxABORT_ON_CONFIG_ERROR
 #if wxUSE_WXHTML_HELP
 #   if !wxUSE_HELP || !wxUSE_HTML || !wxUSE_COMBOBOX || !wxUSE_NOTEBOOK || !wxUSE_SPINCTRL
 #       ifdef wxABORT_ON_CONFIG_ERROR


@@ -1678,16 +1798,6 @@
 #   endif
 #endif /* !wxUSE_IMAGLIST */
 
 #   endif
 #endif /* !wxUSE_IMAGLIST */
 

-#if !wxUSE_MSGDLG
-#   ifdef wxABORT_ON_CONFIG_ERROR
-        /* FIXME: should compile without it, of course, but doesn't */
-#       error "wxMessageBox is always needed"
-#   else
-#       undef wxUSE_MSGDLG
-#       define wxUSE_MSGDLG 1
-#   endif
-#endif
-

 #if wxUSE_RADIOBOX
 #   if !wxUSE_RADIOBTN
 #        ifdef wxABORT_ON_CONFIG_ERROR
 #if wxUSE_RADIOBOX
 #   if !wxUSE_RADIOBTN
 #        ifdef wxABORT_ON_CONFIG_ERROR


@@ -1740,15 +1850,6 @@
 #   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 */
-

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


@@ -1767,6 +1868,33 @@
 #   endif
 #endif /* wxUSE_SOCKETS */
 
 #   endif
 #endif /* wxUSE_SOCKETS */
 

+#if wxUSE_SVG && !wxUSE_STREAMS
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_SVG requires wxUSE_STREAMS"
+#   else
+#       undef wxUSE_SVG
+#       define wxUSE_SVG 0
+#   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
 #if !wxUSE_VARIANT
 #   if wxUSE_DATAVIEWCTRL
 #       ifdef wxABORT_ON_CONFIG_ERROR


@@ -1776,15 +1904,8 @@
 #           define wxUSE_DATAVIEWCTRL 0
 #       endif
 #   endif
 #           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 */
 #endif /* wxUSE_VARIANT */
 
 #endif /* wxUSE_GUI */

+
+#endif /* _WX_CHKCONF_H_ */