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.
This commit is contained in:
Artur Wieczorek 2017-05-03 22:41:33 +02:00
parent b375d81499
commit 83f5ba359d
2 changed files with 10 additions and 1 deletions

View File

@ -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

View File

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