don't draw buttons unless we have wxTR_HAS_BUTTONS style

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

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 631c99b1af86ed7123f5b77f846398867d43b69d..8732dfc01b6f7aa1a0905a8b572ae7e478b572fc 100644 (file)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -11,6 +11,16 @@
 
 /* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
 
+/*
+   Compiler-specific checking.
+ */
+
+#if defined(__WXMSW__)
+#  include "wx/msw/chkconf.h"
+#elif defined(__WXMAC__)
+#  include "wx/mac/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 define BAR
@@ -145,6 +155,14 @@
 #   endif
 #endif /* !defined(wxUSE_REGEX) */
 
+#ifndef wxUSE_XML
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_XML must be defined."
+#   else
+#       define wxUSE_XML 0
+#   endif
+#endif /* !defined(wxUSE_XML) */
+
 #ifndef wxUSE_SOCKETS
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_SOCKETS must be defined."
@@ -756,6 +774,17 @@
 #   endif
 #endif /* wxUSE_FILESYSTEM */
 
+#if wxUSE_FS_INET
+#   if !wxUSE_PROTOCOL
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxUSE_FS_INET requires wxUSE_PROTOCOL"
+#       else
+#           undef wxUSE_PROTOCOL
+#           define wxUSE_PROTOCOL 1
+#       endif
+#   endif
+#endif /* wxUSE_FS_INET */
+
 #if wxUSE_STOPWATCH || wxUSE_DATETIME
 #    if !wxUSE_LONGLONG
 #        ifdef wxABORT_ON_CONFIG_ERROR
@@ -813,6 +842,25 @@
 #   endif
 #endif /* wxUSE_ODBC */
 
+#if wxUSE_XML && !wxUSE_WCHAR_T
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_XML requires wxUSE_WCHAR_T"
+#   else
+#       undef wxUSE_XML
+#       define wxUSE_XML 0
+#   endif
+#endif /* wxUSE_UNICODE_MSLU */
+
+#if !wxUSE_DYNLIB_CLASS
+#   if wxUSE_DYNAMIC_LOADER
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxUSE_DYNAMIC_LOADER requires wxUSE_DYNLIB_CLASS."
+#       else
+#           define wxUSE_DYNLIB_CLASS 1
+#       endif
+#   endif
+#endif  /* wxUSE_DYNLIB_CLASS */
+
 /* the rest of the tests is for the GUI settings only */
 #if wxUSE_GUI
 
@@ -941,6 +989,20 @@
 #           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."
@@ -999,6 +1061,15 @@
 #   endif
 #endif /* wxMGL */
 
+// Hopefully we can emulate these dialogs in due course
+#if wxUSE_SMARTPHONE
+#   ifdef wxUSE_COLOURDLG
+#       undef wxUSE_COLOURDLG
+#       define wxUSE_COLOURDLG 0
+#   endif
+#endif /* wxUSE_SMARTPHONE */
+
+
 /* generic controls dependencies */
 #if !defined(__WXMSW__) || defined(__WXUNIVERSAL__)
 #   if wxUSE_FONTDLG || wxUSE_FILEDLG || wxUSE_CHOICEDLG