From fc96ef3570ce8af258eb2fe9edc56be36fe294fa Mon Sep 17 00:00:00 2001 From: Artur Wieczorek Date: Tue, 9 May 2017 17:05:07 +0200 Subject: [PATCH] Allow build wxNotificationMessage without OLE support (wxUSE_OLE==0) WinRT implementation of wxNotificationMessage can be decoupled from OLE utilities because actually only IUnknown interface implementation is required. --- include/wx/msw/chkconf.h | 9 --------- src/msw/rt/notifmsgrt.cpp | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/include/wx/msw/chkconf.h b/include/wx/msw/chkconf.h index ef851ee9a4..72c3007f97 100644 --- a/include/wx/msw/chkconf.h +++ b/include/wx/msw/chkconf.h @@ -377,15 +377,6 @@ # 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/src/msw/rt/notifmsgrt.cpp b/src/msw/rt/notifmsgrt.cpp index ba8e05330e..af5cf3c578 100644 --- a/src/msw/rt/notifmsgrt.cpp +++ b/src/msw/rt/notifmsgrt.cpp @@ -25,7 +25,7 @@ #include "wx/msw/rt/utils.h" #include "wx/msw/private/comptr.h" #include "wx/msw/wrapshl.h" -#include "wx/msw/ole/oleutils.h" +#include "wx/msw/ole/comimpl.h" #include "wx/filename.h" #include "wx/stdpaths.h"