Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable building without wxUSE_WEBVIEW_IE

Browse Source
This commit is contained in:
Maarten Bent
2020-01-17 09:37:12 +01:00
committed by Tobias Taschner
parent bb508dc347
commit ce968d0ecb
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build/cmake/init.cmake
View File

@@ -406,8 +406,8 @@ if(wxUSE_GUI)
wx_option_force_value(wxUSE_WEBVIEW OFF) wx_option_force_value(wxUSE_WEBVIEW OFF)
endif() endif()
elseif(WXMSW) elseif(WXMSW)
if(NOT wxUSE_WEBVIEW_IE) if(NOT wxUSE_WEBVIEW_IE AND NOT wxUSE_WEBVIEW_EDGE)
message(WARNING "WebviewIE not found or enabled, wxWebview won't be available") message(WARNING "WebviewIE and WebviewEdge not found or enabled, wxWebview won't be available")
wx_option_force_value(wxUSE_WEBVIEW OFF) wx_option_force_value(wxUSE_WEBVIEW OFF)
endif() endif()
elseif(APPLE) elseif(APPLE)

3
include/wx/chkconf.h
View File

@@ -2290,7 +2290,8 @@
# endif # endif
#endif /* wxUSE_TREELISTCTRL */ #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 # ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_WEBVIEW requires at least one backend" # error "wxUSE_WEBVIEW requires at least one backend"
# else # else

2
src/common/webview.cpp
View File

@@ -107,9 +107,11 @@ wxStringWebViewFactoryMap::iterator wxWebView::FindFactory(const wxString &backe
void wxWebView::InitFactoryMap() void wxWebView::InitFactoryMap()
{ {
#ifdef __WXMSW__ #ifdef __WXMSW__
#if wxUSE_WEBVIEW_IE
if(m_factoryMap.find(wxWebViewBackendIE) == m_factoryMap.end()) if(m_factoryMap.find(wxWebViewBackendIE) == m_factoryMap.end())
RegisterFactory(wxWebViewBackendIE, wxSharedPtr<wxWebViewFactory> RegisterFactory(wxWebViewBackendIE, wxSharedPtr<wxWebViewFactory>
(new wxWebViewFactoryIE)); (new wxWebViewFactoryIE));
#endif
#if wxUSE_WEBVIEW_EDGE #if wxUSE_WEBVIEW_EDGE
if (wxWebViewEdge::IsAvailable() && if (wxWebViewEdge::IsAvailable() &&