X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/81f90336020eab200e8f09a6b726c7ec49439b68..622c5145868017d50b47e812d9f30ade57da289d:/include/wx/chkconf.h

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 744fbf0617..361ba6b539 100644
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -40,6 +40,21 @@
 #   define wxUSE_GUI 1
 #endif /* !defined(wxUSE_GUI) */
 
+/*
+    If we're compiling without support for threads/exceptions we have to
+    disable the corresponding features.
+ */
+#ifdef wxNO_THREADS
+#   undef wxUSE_THREADS
+#   define wxUSE_THREADS 0
+#endif /* wxNO_THREADS */
+
+#ifdef wxNO_EXCEPTIONS
+#   undef wxUSE_EXCEPTIONS
+#   define wxUSE_EXCEPTIONS 0
+#endif /* wxNO_EXCEPTIONS */
+
+
 /*
    tests for non GUI features
  */
@@ -933,12 +948,12 @@
 #           define wxUSE_ZLIB 1
 #       endif
 #   endif
-#   if !wxUSE_ARCSTREAM
+#   if !wxUSE_ARCHIVE_STREAMS
 #       ifdef wxABORT_ON_CONFIG_ERROR
 #           error "wxZip requires wxArchive"
 #       else
-#           undef wxUSE_ARCSTREAM
-#           define wxUSE_ARCSTREAM 1
+#           undef wxUSE_ARCHIVE_STREAMS
+#           define wxUSE_ARCHIVE_STREAMS 1
 #       endif
 #   endif
 #endif /* wxUSE_ZIPSTREAM */
@@ -1262,6 +1277,17 @@
 #   endif
 #endif /* wxUSE_CALENDARCTRL */
 
+#if wxUSE_DATEPICKCTRL
+#   if !wxUSE_DATETIME
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxDatePickerCtrl requires wxUSE_DATETIME"
+#       else
+#           undef wxUSE_DATETIME
+#           define wxUSE_DATETIME 1
+#       endif
+#   endif
+#endif /* wxUSE_DATEPICKCTRL */
+
 #if wxUSE_CHECKLISTBOX
 #   if !wxUSE_LISTBOX
 #        ifdef wxABORT_ON_CONFIG_ERROR
@@ -1634,11 +1660,14 @@
 #   endif
 #endif /* wxUSE_XRC */
 
-/* The generic date picker uses a popup window */
-#if !wxUSE_POPUPWIN
-#    undef wxUSE_DATEPICKCTRL
-#    define wxUSE_DATEPICKCTRL 0
-#endif  /* !wxUSE_POPUPWIN */
+#if wxUSE_SOCKETS && !wxUSE_STOPWATCH
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_SOCKETS requires wxUSE_STOPWATCH"
+#   else
+#       undef wxUSE_SOCKETS
+#       define wxUSE_SOCKETS 0
+#   endif
+#endif /* wxUSE_SOCKETS */
 
 #endif /* wxUSE_GUI */