Enable building without wxUSE_WEBVIEW_IE
This commit is contained in:
committed by
Tobias Taschner
parent
bb508dc347
commit
ce968d0ecb
@@ -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)
|
||||
|
@@ -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
|
||||
|
@@ -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<wxWebViewFactory>
|
||||
(new wxWebViewFactoryIE));
|
||||
#endif
|
||||
|
||||
#if wxUSE_WEBVIEW_EDGE
|
||||
if (wxWebViewEdge::IsAvailable() &&
|
||||
|
Reference in New Issue
Block a user