X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9e8e867ff99be2e9d02e4e94766d27068ae66f57..a69e2a0ac7635d1df2dd36ffab64324a8b915384:/include/wx/chkconf.h

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index c69e95ebd6..f3d93c1127 100644
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -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,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 */