From b60cabef281d353eeb7e136e43f0407ae7ef2fdb Mon Sep 17 00:00:00 2001 From: "chunmao.guo" Date: Wed, 30 Nov 2022 11:48:08 +0800 Subject: [PATCH] FIX: [STUDIO-1503] events bind after recreate webview Change-Id: I90ab03a43c5bedb7a89ee50a2ead91ddf5bdf8c3 --- src/slic3r/GUI/MarkdownTip.cpp | 6 +++--- src/slic3r/GUI/WebViewDialog.cpp | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/slic3r/GUI/MarkdownTip.cpp b/src/slic3r/GUI/MarkdownTip.cpp index 80490f38c..f4c2b919f 100644 --- a/src/slic3r/GUI/MarkdownTip.cpp +++ b/src/slic3r/GUI/MarkdownTip.cpp @@ -236,9 +236,9 @@ void MarkdownTip::RunScript(std::string const& script) wxWebView* MarkdownTip::CreateTipView(wxWindow* parent) { wxWebView *tipView = WebView::CreateWebView(parent, ""); - tipView->Bind(wxEVT_WEBVIEW_LOADED, &MarkdownTip::OnLoaded, this); - tipView->Bind(wxEVT_WEBVIEW_TITLE_CHANGED, &MarkdownTip::OnTitleChanged, this); - tipView->Bind(wxEVT_WEBVIEW_ERROR, &MarkdownTip::OnError, this); + Bind(wxEVT_WEBVIEW_LOADED, &MarkdownTip::OnLoaded, this); + Bind(wxEVT_WEBVIEW_TITLE_CHANGED, &MarkdownTip::OnTitleChanged, this); + Bind(wxEVT_WEBVIEW_ERROR, &MarkdownTip::OnError, this); return tipView; } diff --git a/src/slic3r/GUI/WebViewDialog.cpp b/src/slic3r/GUI/WebViewDialog.cpp index a77a90def..640ee10b6 100644 --- a/src/slic3r/GUI/WebViewDialog.cpp +++ b/src/slic3r/GUI/WebViewDialog.cpp @@ -174,13 +174,13 @@ WebViewPanel::WebViewPanel(wxWindow *parent) Bind(wxEVT_TEXT_ENTER, &WebViewPanel::OnUrl, this, m_url->GetId()); // Connect the webview events - Bind(wxEVT_WEBVIEW_NAVIGATING, &WebViewPanel::OnNavigationRequest, this, m_browser->GetId()); - Bind(wxEVT_WEBVIEW_NAVIGATED, &WebViewPanel::OnNavigationComplete, this, m_browser->GetId()); - Bind(wxEVT_WEBVIEW_LOADED, &WebViewPanel::OnDocumentLoaded, this, m_browser->GetId()); - Bind(wxEVT_WEBVIEW_TITLE_CHANGED, &WebViewPanel::OnTitleChanged, this, m_browser->GetId()); - Bind(wxEVT_WEBVIEW_ERROR, &WebViewPanel::OnError, this, m_browser->GetId()); - Bind(wxEVT_WEBVIEW_NEWWINDOW, &WebViewPanel::OnNewWindow, this, m_browser->GetId()); - Bind(wxEVT_WEBVIEW_SCRIPT_MESSAGE_RECEIVED, &WebViewPanel::OnScriptMessage, this, m_browser->GetId()); + Bind(wxEVT_WEBVIEW_NAVIGATING, &WebViewPanel::OnNavigationRequest, this); + Bind(wxEVT_WEBVIEW_NAVIGATED, &WebViewPanel::OnNavigationComplete, this); + Bind(wxEVT_WEBVIEW_LOADED, &WebViewPanel::OnDocumentLoaded, this); + Bind(wxEVT_WEBVIEW_TITLE_CHANGED, &WebViewPanel::OnTitleChanged, this); + Bind(wxEVT_WEBVIEW_ERROR, &WebViewPanel::OnError, this); + Bind(wxEVT_WEBVIEW_NEWWINDOW, &WebViewPanel::OnNewWindow, this); + Bind(wxEVT_WEBVIEW_SCRIPT_MESSAGE_RECEIVED, &WebViewPanel::OnScriptMessage, this); Bind(EVT_RESPONSE_MESSAGE, &WebViewPanel::OnScriptResponseMessage, this); // Connect the menu events