diff --git a/interface/wx/webview.h b/interface/wx/webview.h index 9381ecb6e7..4b289e746e 100644 --- a/interface/wx/webview.h +++ b/interface/wx/webview.h @@ -431,7 +431,8 @@ public: @event{EVT_WEBVIEW_FULL_SCREEN_CHANGED(id, func)} Process a @c EVT_WEBVIEW_FULL_SCREEN_CHANGED event, generated when the page wants to enter or leave fullscreen. Use GetInt to get the status. - Currently only implemented for the edge and WebKit2GTK+ backend. + Currently only implemented for the edge and WebKit2GTK+ backend + and is only available in wxWidgets 3.1.5 or later. @endEventTable @since 2.9.3 diff --git a/src/msw/webview_edge.cpp b/src/msw/webview_edge.cpp index 7bbf28276f..355d384e31 100644 --- a/src/msw/webview_edge.cpp +++ b/src/msw/webview_edge.cpp @@ -177,19 +177,19 @@ HRESULT wxWebViewEdgeImpl::OnNavigationStarting(ICoreWebView2* WXUNUSED(sender), return S_OK; } -HRESULT wxWebViewEdgeImpl::OnSourceChanged(ICoreWebView2 * WXUNUSED(sender), ICoreWebView2SourceChangedEventArgs * args) +HRESULT wxWebViewEdgeImpl::OnSourceChanged(ICoreWebView2 * WXUNUSED(sender), ICoreWebView2SourceChangedEventArgs * args) { BOOL isNewDocument; if (SUCCEEDED(args->get_IsNewDocument(&isNewDocument)) && !isNewDocument) { - // navigation within the current document, send apropriate events + // navigation within the current document, send apropriate events wxWebViewEvent event(wxEVT_WEBVIEW_NAVIGATING, m_ctrl->GetId(), m_ctrl->GetCurrentURL(), wxString()); event.SetEventObject(m_ctrl); m_ctrl->HandleWindowEvent(event); OnNavigationCompleted(NULL, NULL); OnContentLoading(NULL, NULL); - } - return S_OK; + } + return S_OK; } HRESULT wxWebViewEdgeImpl::OnNavigationCompleted(ICoreWebView2* WXUNUSED(sender), ICoreWebView2NavigationCompletedEventArgs* args) @@ -302,7 +302,7 @@ HRESULT wxWebViewEdgeImpl::OnContentLoading(ICoreWebView2* WXUNUSED(sender), ICo return S_OK; } -HRESULT wxWebViewEdgeImpl::OnContainsFullScreenElementChanged(ICoreWebView2* WXUNUSED(sender), IUnknown* WXUNUSED(args)) +HRESULT wxWebViewEdgeImpl::OnContainsFullScreenElementChanged(ICoreWebView2* WXUNUSED(sender), IUnknown* WXUNUSED(args)) { BOOL containsFullscreenEvent; HRESULT hr = m_webView->get_ContainsFullScreenElement(&containsFullscreenEvent); @@ -310,12 +310,12 @@ HRESULT wxWebViewEdgeImpl::OnContainsFullScreenElementChanged(ICoreWebView2* WXU return hr; wxWebViewEvent event(wxEVT_WEBVIEW_FULLSCREEN_CHANGED, m_ctrl->GetId(), - m_ctrl->GetCurrentURL(), ""); + m_ctrl->GetCurrentURL(), wxString()); event.SetEventObject(m_ctrl); event.SetInt(containsFullscreenEvent); m_ctrl->HandleWindowEvent(event); - - return S_OK; + + return S_OK; } HRESULT wxWebViewEdgeImpl::OnWebViewCreated(HRESULT result, ICoreWebView2Controller* webViewController)