diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 5072accba8..6a51a7ad71 100644
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -1609,5 +1609,11 @@
 #   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 */