diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake index a0cfe8c541..f57863deb2 100644 --- a/build/cmake/init.cmake +++ b/build/cmake/init.cmake @@ -406,8 +406,8 @@ if(wxUSE_GUI) wx_option_force_value(wxUSE_WEBVIEW OFF) endif() elseif(WXMSW) - if(NOT wxUSE_WEBVIEW_IE) - message(WARNING "WebviewIE not found or enabled, wxWebview won't be available") + if(NOT wxUSE_WEBVIEW_IE AND NOT wxUSE_WEBVIEW_EDGE) + message(WARNING "WebviewIE and WebviewEdge not found or enabled, wxWebview won't be available") wx_option_force_value(wxUSE_WEBVIEW OFF) endif() elseif(APPLE) diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h index 47c9f9c489..9d0e7f743c 100644 --- a/include/wx/chkconf.h +++ b/include/wx/chkconf.h @@ -2290,7 +2290,8 @@ # endif #endif /* wxUSE_TREELISTCTRL */ -#if wxUSE_WEBVIEW && !(wxUSE_WEBVIEW_WEBKIT || wxUSE_WEBVIEW_WEBKIT2 || wxUSE_WEBVIEW_IE) +#if wxUSE_WEBVIEW && !(wxUSE_WEBVIEW_WEBKIT || wxUSE_WEBVIEW_WEBKIT2 || \ + wxUSE_WEBVIEW_IE || wxUSE_WEBVIEW_EDGE) # ifdef wxABORT_ON_CONFIG_ERROR # error "wxUSE_WEBVIEW requires at least one backend" # else diff --git a/src/common/webview.cpp b/src/common/webview.cpp index e7cd9c158f..0a46c5fccd 100644 --- a/src/common/webview.cpp +++ b/src/common/webview.cpp @@ -107,9 +107,11 @@ wxStringWebViewFactoryMap::iterator wxWebView::FindFactory(const wxString &backe void wxWebView::InitFactoryMap() { #ifdef __WXMSW__ +#if wxUSE_WEBVIEW_IE if(m_factoryMap.find(wxWebViewBackendIE) == m_factoryMap.end()) RegisterFactory(wxWebViewBackendIE, wxSharedPtr (new wxWebViewFactoryIE)); +#endif #if wxUSE_WEBVIEW_EDGE if (wxWebViewEdge::IsAvailable() &&