Disable OLE support if wxDataObject is disabled in wxMSW
wxDataObject is a basic requirement for too many OLE-related things. See #17159.
This commit is contained in:
@@ -264,6 +264,17 @@
|
|||||||
# endif
|
# endif
|
||||||
#endif /* !wxUSE_VARIANT */
|
#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_DYNAMIC_LOADER
|
||||||
# if wxUSE_MS_HTML_HELP
|
# if wxUSE_MS_HTML_HELP
|
||||||
# ifdef wxABORT_ON_CONFIG_ERROR
|
# ifdef wxABORT_ON_CONFIG_ERROR
|
||||||
|
Reference in New Issue
Block a user