diff --git a/include/wx/msw/chkconf.h b/include/wx/msw/chkconf.h
index e6e866faff..f83d387b15 100644
--- a/include/wx/msw/chkconf.h
+++ b/include/wx/msw/chkconf.h
@@ -264,6 +264,17 @@
 #   endif
 #endif /* !wxUSE_VARIANT */
 
+#if !wxUSE_DATAOBJ
+#   if wxUSE_OLE
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxUSE_OLE requires wxDataObject"
+#       else
+#           undef wxUSE_OLE
+#           define wxUSE_OLE 0
+#       endif
+#   endif
+#endif /* !wxUSE_DATAOBJ */
+
 #if !wxUSE_DYNAMIC_LOADER
 #    if wxUSE_MS_HTML_HELP
 #        ifdef wxABORT_ON_CONFIG_ERROR