From 9e0020732c994560e5765241e8f27fd023c447c7 Mon Sep 17 00:00:00 2001 From: Tobias Taschner Date: Wed, 31 Jan 2018 22:41:52 +0100 Subject: [PATCH] Change wxWebViewChromium::RunScript to current API Returning a value is currently not supported and will return false --- include/wx/webview_chromium.h | 2 +- src/common/webview_chromium.cpp | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/include/wx/webview_chromium.h b/include/wx/webview_chromium.h index 2d90cc3070..1efb2e03fb 100644 --- a/include/wx/webview_chromium.h +++ b/include/wx/webview_chromium.h @@ -262,7 +262,7 @@ public: virtual wxString GetSelectedSource() const { return ""; } virtual void ClearSelection(); - virtual void RunScript(const wxString& javascript); + virtual bool RunScript(const wxString& javascript, wxString* output = NULL) wxOVERRIDE; //Virtual Filesystem Support virtual void RegisterHandler(wxSharedPtr handler); diff --git a/src/common/webview_chromium.cpp b/src/common/webview_chromium.cpp index ef2b37d0cd..873b61da7d 100644 --- a/src/common/webview_chromium.cpp +++ b/src/common/webview_chromium.cpp @@ -343,10 +343,15 @@ void wxWebViewChromium::ClearSelection() RunScript(jsclear); } -void wxWebViewChromium::RunScript(const wxString& javascript) +bool wxWebViewChromium::RunScript(const wxString& javascript, wxString* output) { m_clientHandler->GetBrowser()->GetMainFrame()->ExecuteJavaScript(javascript.ToStdString(), "", 0); + // Returning a result is currently unsupported + if (output) + return false; + else + return true; } bool wxWebViewChromium::IsBusy() const