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

Move WebView2 event handling from lambdas to functions

Browse Source
This commit is contained in:
Tobias Taschner
2020-01-15 21:51:58 +01:00
parent bbde6e2e88
commit 964992e7ff
2 changed files with 138 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,18 +32,24 @@ public:
bool m_isBusy;
wxString m_pendingURL;
// WebView Events tokens
EventRegistrationToken m_navigationStartingToken = { };
EventRegistrationToken m_navigationCompletedToken = { };
EventRegistrationToken m_newWindowRequestedToken = { };
EventRegistrationToken m_documentStateChangedToken = { };
// WebView Event handlers
HRESULT OnNavigationStarting(IWebView2WebView* sender, IWebView2NavigationStartingEventArgs* args);
HRESULT OnNavigationCompleted(IWebView2WebView* sender, IWebView2NavigationCompletedEventArgs* args);
HRESULT OnNewWindowRequested(IWebView2WebView* sender, IWebView2NewWindowRequestedEventArgs* args);
HRESULT OnEnvironmentCreated(HRESULT result, IWebView2Environment* environment);
HRESULT OnWebViewCreated(HRESULT result, IWebView2WebView* webview);
wxVector<wxSharedPtr<wxWebViewHistoryItem> > m_historyList;
int m_historyPosition;
bool m_historyLoadingFromList;
bool m_historyEnabled;
void InitWebViewCtrl();
void UpdateBounds();
IWebView2Settings2* GetSettings();