diff --git a/src/slic3r/GUI/WebView.cpp b/src/slic3r/GUI/WebView.cpp index 2b2f58267f..f980556c3d 100644 --- a/src/slic3r/GUI/WebView.cpp +++ b/src/slic3r/GUI/WebView.cpp @@ -56,9 +56,3 @@ wxWebView* WebView::CreateWebView(wxWindow * parent, const wxString& url) } - -bool WebView::run_script(wxWebView *webView, wxString const &javascript) -{ - webView->RunScriptAsync(javascript); - return true; -} diff --git a/src/slic3r/GUI/WebView.hpp b/src/slic3r/GUI/WebView.hpp index 6893e8965e..40ea745f10 100644 --- a/src/slic3r/GUI/WebView.hpp +++ b/src/slic3r/GUI/WebView.hpp @@ -8,7 +8,6 @@ class wxString; namespace WebView { wxWebView *CreateWebView(wxWindow *parent, const wxString& url); - bool run_script(wxWebView * webView, const wxString& msg); }; #endif // !slic3r_GUI_WebView_hpp_ diff --git a/src/slic3r/GUI/WebViewDialog.cpp b/src/slic3r/GUI/WebViewDialog.cpp index 1aa8bbc903..daea6cd553 100644 --- a/src/slic3r/GUI/WebViewDialog.cpp +++ b/src/slic3r/GUI/WebViewDialog.cpp @@ -318,11 +318,8 @@ void WebViewPanel::run_script(const wxString& javascript) // Remember the script we run in any case, so the next time the user opens // the "Run Script" dialog box, it is shown there for convenient updating. m_javascript = javascript; - - if (!m_browser) return; - - bool res = WebView::run_script(m_browser, javascript); - BOOST_LOG_TRIVIAL(debug) << "RunScript " << javascript << " " << res; + BOOST_LOG_TRIVIAL(debug) << "RunScript " << javascript; + m_browser->RunScriptAsync(javascript); } @@ -681,8 +678,7 @@ void WebViewDialog::run_script(const wxString& javascript) { if (!m_browser) return; - // dk_FIXME: Is it ok to discard the return value? - /*bool res = */ WebView::run_script(m_browser, javascript); + m_browser->RunScriptAsync(javascript); } PrinterPickWebViewDialog::PrinterPickWebViewDialog(wxWindow* parent, std::string& ret_val)