X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/050242339cc3e56f84fcc811d3e7f59fc2317747..b6428abaa5ac53c69c6113b86c0a0b8b05b93df7:/include/wx/chkconf.h?ds=sidebyside

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 2f04543e91..ba91775a20 100644
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -27,6 +27,8 @@
 #  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__)
@@ -286,6 +288,14 @@
 #   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
 
@@ -306,6 +316,14 @@
 #   endif
 #endif /* !defined(wxUSE_ACCEL) */
 
+#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."
@@ -1192,6 +1210,15 @@
 #   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
@@ -1623,15 +1650,6 @@
 #            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
@@ -1734,4 +1752,24 @@
 #   endif
 #endif /* wxUSE_SOCKETS */
 
+#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 */