From 83f5ba359d016acd166c1d13018b01daf5373424 Mon Sep 17 00:00:00 2001
From: Artur Wieczorek <artwik@wp.pl>
Date: Wed, 3 May 2017 22:41:33 +0200
Subject: [PATCH] Add check for wxUSE_DRAG_AND_DROP dependency on wxUSE_OLE

Library itself can be built successfully when wxUSE_DRAG_AND_DROP==1 and
wxUSE_OLE==0 but several wxDropTarget functions (referred in wxWindowMSW,
wxTextDropTarget, wxFileDropTarget) are reported as missing during linking
the application.
---
 include/wx/msw/chkconf.h | 9 +++++++++
 include/wx/msw/setup0.h  | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

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.
 //