From f2e707f095ce2ae7fab24aab482b53525b0dd895 Mon Sep 17 00:00:00 2001 From: Artur Wieczorek Date: Wed, 3 May 2017 22:42:22 +0200 Subject: [PATCH] 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). --- 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 5e5b5522cb..585b7182ff 100644 --- a/include/wx/msw/chkconf.h +++ b/include/wx/msw/chkconf.h @@ -372,6 +372,15 @@ # define wxUSE_DRAG_AND_DROP 0 # 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 */ #if !wxUSE_ACTIVEX diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h index 79437947c4..5ba078d3fe 100644 --- a/include/wx/msw/setup0.h +++ b/include/wx/msw/setup0.h @@ -1115,7 +1115,7 @@ // // wxNotificationMessage allows to show non-intrusive messages to the user // 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. //