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

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 744fbf0617..b6db50e9f5 100644
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -933,12 +933,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 +1262,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 +1645,5 @@
 #   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 */
-
 #endif /* wxUSE_GUI */