diff --git a/include/wx/msw/chkconf.h b/include/wx/msw/chkconf.h
index 34369c17ca..5e5b5522cb 100644
--- a/include/wx/msw/chkconf.h
+++ b/include/wx/msw/chkconf.h
@@ -363,6 +363,15 @@
 #           define wxUSE_OLE_AUTOMATION 0
 #       endif
 #   endif
+
+#   if wxUSE_DRAG_AND_DROP
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxUSE_DRAG_AND_DROP requires wxUSE_OLE"
+#       else
+#           undef wxUSE_DRAG_AND_DROP
+#           define wxUSE_DRAG_AND_DROP 0
+#       endif
+#   endif
 #endif /* !wxUSE_OLE */
 
 #if !wxUSE_ACTIVEX
diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index 0aa9e3d9c9..79437947c4 100644
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -1374,7 +1374,7 @@
 
 // Use wxDropTarget and wxDropSource classes for drag and drop (this is
 // different from "built in" drag and drop in wxTreeCtrl which is always
-// available). Requires wxUSE_DATAOBJ.
+// available). Requires wxUSE_DATAOBJ and wxUSE_OLE.
 //
 // Default is 1.
 //