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

Fix EOL issues

Browse Source
This commit is contained in:
Tobias Taschner
2021-02-28 20:01:27 +01:00
parent 2c3d179923
commit 2a16638e2a
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
samples/webview/webview.cpp
View File

@@ -1191,11 +1191,11 @@ void WebFrame::OnRunScriptArrayWithEmulationLevel(wxCommandEvent& WXUNUSED(evt))
} }
#endif #endif
void WebFrame::OnRunScriptMessage(wxCommandEvent & evt) void WebFrame::OnRunScriptMessage(wxCommandEvent & evt)
{ {
RunScript("window.wx.postMessage('This is a web message');"); RunScript("window.wx.postMessage('This is a web message');");
} }
void WebFrame::OnRunScriptCustom(wxCommandEvent& WXUNUSED(evt)) void WebFrame::OnRunScriptCustom(wxCommandEvent& WXUNUSED(evt))
{ {
wxTextEntryDialog dialog wxTextEntryDialog dialog
@@ -1210,9 +1210,9 @@ void WebFrame::OnRunScriptCustom(wxCommandEvent& WXUNUSED(evt))
return; return;
RunScript(dialog.GetValue()); RunScript(dialog.GetValue());
} }
void WebFrame::OnAddUserScript(wxCommandEvent & WXUNUSED(evt)) void WebFrame::OnAddUserScript(wxCommandEvent & WXUNUSED(evt))
{ {
wxString userScript = "window.wx_test_var = 'wxWidgets webview sample';"; wxString userScript = "window.wx_test_var = 'wxWidgets webview sample';";
wxTextEntryDialog dialog wxTextEntryDialog dialog

6
src/msw/webview_edge.cpp
View File

@@ -440,7 +440,7 @@ HRESULT wxWebViewEdgeImpl::OnWebViewCreated(HRESULT result, ICoreWebView2Control
return S_OK; return S_OK;
} }
void wxWebViewEdgeImpl::UpdateWebMessageHandler() void wxWebViewEdgeImpl::UpdateWebMessageHandler()
{ {
wxCOMPtr<ICoreWebView2Settings> settings(GetSettings()); wxCOMPtr<ICoreWebView2Settings> settings(GetSettings());
if (!settings) if (!settings)
@@ -856,11 +856,11 @@ bool wxWebViewEdge::RemoveScriptMessageHandler(const wxString& WXUNUSED(name))
return true; return true;
} }
HRESULT wxWebViewEdgeImpl::OnAddScriptToExecuteOnDocumentedCreatedCompleted(HRESULT errorCode, LPCWSTR id) HRESULT wxWebViewEdgeImpl::OnAddScriptToExecuteOnDocumentedCreatedCompleted(HRESULT errorCode, LPCWSTR id)
{ {
if (SUCCEEDED(errorCode)) if (SUCCEEDED(errorCode))
m_userScriptIds.push_back(id); m_userScriptIds.push_back(id);
return S_OK; return S_OK;
} }
bool wxWebViewEdge::AddUserScript(const wxString& javascript, bool wxWebViewEdge::AddUserScript(const wxString& javascript,