From c9fad20b7b5f0ce8e2a3ee3934a6ead35e80323c Mon Sep 17 00:00:00 2001 From: stahta01 Date: Fri, 17 Feb 2017 16:02:17 -0500 Subject: [PATCH] Fix checks for wxUSE_WEBVIEW in MSW config checks This fixes -Wundef warnings about "wxUSE_WEB" being not defined when OLE support is disabled. --- include/wx/msw/chkconf.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/wx/msw/chkconf.h b/include/wx/msw/chkconf.h index 5d9de9aeeb..c672b728c2 100644 --- a/include/wx/msw/chkconf.h +++ b/include/wx/msw/chkconf.h @@ -383,12 +383,12 @@ # define wxUSE_MEDIACTRL 0 # endif # endif -# if wxUSE_WEB +# if wxUSE_WEBVIEW # ifdef wxABORT_ON_CONFIG_ERROR # error "wxWebView requires wxActiveXContainer under MSW" # else -# undef wxUSE_WEB -# define wxUSE_WEB 0 +# undef wxUSE_WEBVIEW +# define wxUSE_WEBVIEW 0 # endif # endif #endif /* !wxUSE_ACTIVEX */ @@ -431,12 +431,12 @@ #if !wxUSE_OLE_AUTOMATION -# if wxUSE_WEB +# if wxUSE_WEBVIEW # ifdef wxABORT_ON_CONFIG_ERROR # error "wxWebView requires wxUSE_OLE_AUTOMATION under MSW" # else -# undef wxUSE_WEB -# define wxUSE_WEB 0 +# undef wxUSE_WEBVIEW +# define wxUSE_WEBVIEW 0 # endif # endif #endif /* !wxUSE_OLE_AUTOMATION */