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

Use the same function signature as the WebView2 SDK

Browse Source
This commit is contained in:
Maarten Bent
2021-01-27 22:34:15 +01:00
committed by Vadim Zeitlin
parent b465a95dcc
commit 84b19a0ce0
2 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/msw/private/comptr.h
View File

@@ -100,6 +100,11 @@ public:
return m_ptr; return m_ptr;
} }
T* Get() const
{
return m_ptr;
}
bool operator<(T* ptr) const bool operator<(T* ptr) const
{ {
return get() < ptr; return get() < ptr;

44
src/msw/webview_edge.cpp
View File

@@ -93,19 +93,19 @@ template <
typename baseT, typename lambdaT, // base type & lambda type typename baseT, typename lambdaT, // base type & lambda type
typename LT, typename ...argTs // for capturing argument types of lambda typename LT, typename ...argTs // for capturing argument types of lambda
> >
baseT *callback_impl(lambdaT&& lambda, HRESULT (LT::*)(argTs...) const) wxCOMPtr<baseT> Callback_impl(lambdaT&& lambda, HRESULT (LT::*)(argTs...) const)
{ {
return new CInvokableLambda<baseT, argTs...>(lambda); return wxCOMPtr<baseT>(new CInvokableLambda<baseT, argTs...>(lambda));
} }
template <typename baseT, typename lambdaT> template <typename baseT, typename lambdaT>
baseT *callback(lambdaT&& lambda) wxCOMPtr<baseT> Callback(lambdaT&& lambda)
{ {
return callback_impl<baseT>(std::move(lambda), &lambdaT::operator()); return Callback_impl<baseT>(std::move(lambda), &lambdaT::operator());
} }
template <typename baseT, typename contextT, typename ...argTs> template <typename baseT, typename contextT, typename ...argTs>
baseT *callback(contextT *ctx, HRESULT (contextT::*mthd)(argTs...)) wxCOMPtr<baseT> Callback(contextT *ctx, HRESULT (contextT::*mthd)(argTs...))
{ {
return new CInvokableMethod<baseT, contextT, argTs...>(ctx, mthd); return wxCOMPtr<baseT>(new CInvokableMethod<baseT, contextT, argTs...>(ctx, mthd));
} }
wxIMPLEMENT_DYNAMIC_CLASS(wxWebViewEdge, wxWebView); wxIMPLEMENT_DYNAMIC_CLASS(wxWebViewEdge, wxWebView);
@@ -170,8 +170,8 @@ bool wxWebViewEdgeImpl::Create()
ms_browserExecutableDir.wc_str(), ms_browserExecutableDir.wc_str(),
userDataPath.wc_str(), userDataPath.wc_str(),
nullptr, nullptr,
callback<ICoreWebView2CreateCoreWebView2EnvironmentCompletedHandler>(this, Callback<ICoreWebView2CreateCoreWebView2EnvironmentCompletedHandler>(this,
&wxWebViewEdgeImpl::OnEnvironmentCreated)); &wxWebViewEdgeImpl::OnEnvironmentCreated).Get());
if (FAILED(hr)) if (FAILED(hr))
{ {
wxLogApiError("CreateWebView2EnvironmentWithOptions", hr); wxLogApiError("CreateWebView2EnvironmentWithOptions", hr);
@@ -187,8 +187,8 @@ HRESULT wxWebViewEdgeImpl::OnEnvironmentCreated(
environment->QueryInterface(IID_PPV_ARGS(&m_webViewEnvironment)); environment->QueryInterface(IID_PPV_ARGS(&m_webViewEnvironment));
m_webViewEnvironment->CreateCoreWebView2Controller( m_webViewEnvironment->CreateCoreWebView2Controller(
m_ctrl->GetHWND(), m_ctrl->GetHWND(),
callback<ICoreWebView2CreateCoreWebView2ControllerCompletedHandler>( Callback<ICoreWebView2CreateCoreWebView2ControllerCompletedHandler>(
this, &wxWebViewEdgeImpl::OnWebViewCreated)); this, &wxWebViewEdgeImpl::OnWebViewCreated).Get());
return S_OK; return S_OK;
} }
@@ -417,28 +417,28 @@ HRESULT wxWebViewEdgeImpl::OnWebViewCreated(HRESULT result, ICoreWebView2Control
// Connect and handle the various WebView events // Connect and handle the various WebView events
m_webView->add_NavigationStarting( m_webView->add_NavigationStarting(
callback<ICoreWebView2NavigationStartingEventHandler>( Callback<ICoreWebView2NavigationStartingEventHandler>(
this, &wxWebViewEdgeImpl::OnNavigationStarting), this, &wxWebViewEdgeImpl::OnNavigationStarting).Get(),
&m_navigationStartingToken); &m_navigationStartingToken);
m_webView->add_SourceChanged( m_webView->add_SourceChanged(
Callback<ICoreWebView2SourceChangedEventHandler>( Callback<ICoreWebView2SourceChangedEventHandler>(
this, &wxWebViewEdgeImpl::OnSourceChanged).Get(), this, &wxWebViewEdgeImpl::OnSourceChanged).Get(),
&m_sourceChangedToken); &m_sourceChangedToken);
m_webView->add_NavigationCompleted( m_webView->add_NavigationCompleted(
callback<ICoreWebView2NavigationCompletedEventHandler>( Callback<ICoreWebView2NavigationCompletedEventHandler>(
this, &wxWebViewEdgeImpl::OnNavigationCompleted), this, &wxWebViewEdgeImpl::OnNavigationCompleted).Get(),
&m_navigationCompletedToken); &m_navigationCompletedToken);
m_webView->add_NewWindowRequested( m_webView->add_NewWindowRequested(
callback<ICoreWebView2NewWindowRequestedEventHandler>( Callback<ICoreWebView2NewWindowRequestedEventHandler>(
this, &wxWebViewEdgeImpl::OnNewWindowRequested), this, &wxWebViewEdgeImpl::OnNewWindowRequested).Get(),
&m_newWindowRequestedToken); &m_newWindowRequestedToken);
m_webView->add_DocumentTitleChanged( m_webView->add_DocumentTitleChanged(
callback<ICoreWebView2DocumentTitleChangedEventHandler>( Callback<ICoreWebView2DocumentTitleChangedEventHandler>(
this, &wxWebViewEdgeImpl::OnDocumentTitleChanged), this, &wxWebViewEdgeImpl::OnDocumentTitleChanged).Get(),
&m_documentTitleChangedToken); &m_documentTitleChangedToken);
m_webView->add_ContentLoading( m_webView->add_ContentLoading(
callback<ICoreWebView2ContentLoadingEventHandler>( Callback<ICoreWebView2ContentLoadingEventHandler>(
this, &wxWebViewEdgeImpl::OnContentLoading), this, &wxWebViewEdgeImpl::OnContentLoading).Get(),
&m_contentLoadingToken); &m_contentLoadingToken);
m_webView->add_ContainsFullScreenElementChanged( m_webView->add_ContainsFullScreenElementChanged(
Callback<ICoreWebView2ContainsFullScreenElementChangedEventHandler>( Callback<ICoreWebView2ContainsFullScreenElementChangedEventHandler>(
@@ -786,7 +786,7 @@ bool wxWebViewEdge::RunScriptSync(const wxString& javascript, wxString* output)
bool scriptExecuted = false; bool scriptExecuted = false;
// Start script execution // Start script execution
HRESULT executionResult = m_impl->m_webView->ExecuteScript(javascript.wc_str(), callback<ICoreWebView2ExecuteScriptCompletedHandler>( HRESULT executionResult = m_impl->m_webView->ExecuteScript(javascript.wc_str(), Callback<ICoreWebView2ExecuteScriptCompletedHandler>(
[&scriptExecuted, &executionResult, output](HRESULT error, PCWSTR result) -> HRESULT [&scriptExecuted, &executionResult, output](HRESULT error, PCWSTR result) -> HRESULT
{ {
// Handle script execution callback // Handle script execution callback
@@ -801,7 +801,7 @@ bool wxWebViewEdge::RunScriptSync(const wxString& javascript, wxString* output)
scriptExecuted = true; scriptExecuted = true;
return S_OK; return S_OK;
})); }).Get());
// Wait for script exection // Wait for script exection
while (!scriptExecuted) while (!scriptExecuted)