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

Clear script ids in RemoveAllUserScripts()

Browse Source
This commit is contained in:
Tobias Taschner 2021-02-28 22:38:09 +01:00
parent 5a30bbe38f
commit 5e35e6c635
No known key found for this signature in database
GPG Key ID: AE6ECD71294F87FD
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/msw/webview_edge.cpp
View File

@ -887,13 +887,13 @@ bool wxWebViewEdge::AddUserScript(const wxString& javascript,
void wxWebViewEdge::RemoveAllUserScripts() void wxWebViewEdge::RemoveAllUserScripts()
{ {
m_impl->m_pendingUserScripts.clear(); m_impl->m_pendingUserScripts.clear();
for (wxVector<wxString>::iterator it = m_impl->m_userScriptIds.begin(); for (auto& scriptId : m_impl->m_userScriptIds)
it != m_impl->m_userScriptIds.end(); ++it)
{ {
HRESULT hr = m_impl->m_webView->RemoveScriptToExecuteOnDocumentCreated(it->wc_str()); HRESULT hr = m_impl->m_webView->RemoveScriptToExecuteOnDocumentCreated(scriptId.wc_str());
if (FAILED(hr)) if (FAILED(hr))
wxLogApiError("RemoveScriptToExecuteOnDocumentCreated", hr); wxLogApiError("RemoveScriptToExecuteOnDocumentCreated", hr);
} }
m_impl->m_userScriptIds.clear();
} }
void wxWebViewEdge::RegisterHandler(wxSharedPtr<wxWebViewHandler> handler) void wxWebViewEdge::RegisterHandler(wxSharedPtr<wxWebViewHandler> handler)