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

Merge branch 'webview_edge3' of https://github.com/TcT2k/wxWidgets

Browse Source 
Update wxWebViewEdge for SDK 0.9.488.

It now requires Edge 84.0.488.0 or newer (currently Canary).

See https://github.com/wxWidgets/wxWidgets/pull/1814
This commit is contained in:
Vadim Zeitlin
2020-04-21 18:30:53 +02:00
parent 896512c732 26aa9c492e
commit 62372d4337
3 changed files with 48 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/msw/private/webview_edge.h
View File

@@ -31,7 +31,7 @@ public:
wxCOMPtr<ICoreWebView2Environment> m_webViewEnvironment;
wxCOMPtr<ICoreWebView2> m_webView;
wxCOMPtr<ICoreWebView2Host> m_webViewHost;
wxCOMPtr<ICoreWebView2Controller> m_webViewController;
bool m_initialized;
bool m_isBusy;
@@ -52,7 +52,7 @@ public:
HRESULT OnContentLoading(ICoreWebView2* sender, ICoreWebView2ContentLoadingEventArgs* args);
HRESULT OnEnvironmentCreated(HRESULT result, ICoreWebView2Environment* environment);
HRESULT OnWebViewCreated(HRESULT result, ICoreWebView2Host* webViewHost);
HRESULT OnWebViewCreated(HRESULT result, ICoreWebView2Controller* webViewController);
wxVector<wxSharedPtr<wxWebViewHistoryItem> > m_historyList;
int m_historyPosition;