mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-28 02:30:05 +00:00
Code Activity

Windows: Added support for Chromium-based WebView2 browser in WebBrowserComponent and removed WinRT webview

Browse source
This commit is contained in:
ed 2020-06-12 14:21:01 +01:00
parent 5467c57e23
commit 87fcf2f353
7 changed files with 308 additions and 378 deletions
Download patch file Download diff file Expand all files Collapse all files

15
modules/juce_gui_extra/juce_gui_extra.cpp
View file

@ -33,7 +33,7 @@
#define JUCE_GRAPHICS_INCLUDE_COREGRAPHICS_HELPERS 1
#define JUCE_GUI_BASICS_INCLUDE_XHEADERS 1
#if JUCE_USE_WINRT_WEBVIEW
#if JUCE_USE_WIN_WEBVIEW2
#define JUCE_EVENTS_INCLUDE_WINRT_WRAPPER 1
#endif
@ -85,9 +85,8 @@
#if JUCE_WEB_BROWSER
#include <exdisp.h>
#include <exdispid.h>
#if JUCE_USE_WINRT_WEBVIEW
#include <windows.web.ui.h>
#include <windows.web.ui.interop.h>
#if JUCE_USE_WIN_WEBVIEW2
#include <windows.foundation.h>
#include <windows.foundation.collections.h>
@ -96,7 +95,15 @@
#include <wrl.h>
#include <wrl/wrappers/corewrappers.h>
#pragma warning (pop)
#include "WebView2.h"
#pragma warning (push)
#pragma warning (disable: 4458)
#include "WebView2EnvironmentOptions.h"
#pragma warning (pop)
#endif
#endif
//==============================================================================