Add check for wxUSE_NOTIFICATION_MESSAGE dependency on wxUSE_OLE

WinRT implementation of wxNotificationMessage requires wxUSE_OLE because
one memeber variable is of type wxAutoULong which is defined in the OLE
utilities collection (oleutils.h).
This commit is contained in:
Artur Wieczorek
2017-05-03 22:42:22 +02:00
parent 83f5ba359d
commit f2e707f095
2 changed files with 10 additions and 1 deletions

View File

@@ -372,6 +372,15 @@
# define wxUSE_DRAG_AND_DROP 0 # define wxUSE_DRAG_AND_DROP 0
# endif # endif
# endif # endif
# if wxUSE_NOTIFICATION_MESSAGE && wxUSE_WINRT
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_NOTIFICATION_MESSAGE requires wxUSE_OLE"
# else
# undef wxUSE_NOTIFICATION_MESSAGE
# define wxUSE_NOTIFICATION_MESSAGE 0
# endif
# endif
#endif /* !wxUSE_OLE */ #endif /* !wxUSE_OLE */
#if !wxUSE_ACTIVEX #if !wxUSE_ACTIVEX

View File

@@ -1115,7 +1115,7 @@
// //
// wxNotificationMessage allows to show non-intrusive messages to the user // wxNotificationMessage allows to show non-intrusive messages to the user
// using balloons, banners, popups or whatever is the appropriate method for // using balloons, banners, popups or whatever is the appropriate method for
// the current platform. // the current platform. Requires wxUSE_OLE if wxUSE_WINRT is 1.
// //
// Default is 1. // Default is 1.
// //