From 3545e9d7789c1a7dd60fcdc34234a973a9a49e90 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 20 Sep 2015 13:52:20 +0200 Subject: [PATCH] Disable OLE support if wxDataObject is disabled in wxMSW wxDataObject is a basic requirement for too many OLE-related things. See #17159. --- include/wx/msw/chkconf.h | 11 +++++++++++ 1 file changed, 11 insertions(+) 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