From 0dfba478dff94b0e928c3fc7eee4dedd9fe710d3 Mon Sep 17 00:00:00 2001 From: "zhou.xu" Date: Tue, 25 Mar 2025 10:13:48 +0800 Subject: [PATCH] ENH:Leave the lifecycle of the window to wxwidget management jira: none Change-Id: Ie059192eedd755524d8f010b73849bf2e70476cd (cherry picked from commit fc476f115daabe9aaa175cb87f3d506d9b9e1f84) --- src/slic3r/GUI/Plater.cpp | 6 +++--- src/slic3r/GUI/Plater.hpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index ae360f16fc..8abd0f644e 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -2910,7 +2910,7 @@ void Sidebar::sync_ams_list(bool is_from_big_sync_btn) temp_info.use_dialog_pos = false; temp_info.cancel_text_to_later = is_from_big_sync_btn; if (m_sync_dlg == nullptr) { - m_sync_dlg = std::make_shared(this, temp_info); + m_sync_dlg = new SyncAmsInfoDialog(this, temp_info); } else { m_sync_dlg->set_info(temp_info); } @@ -3199,7 +3199,7 @@ void Sidebar::pop_sync_nozzle_and_ams_dialog() { if (m_fna_dialog) { m_fna_dialog->on_hide(); } m_sna_dialog->update_info(temp_na_info); } else { - m_sna_dialog = std::make_shared(temp_na_info); + m_sna_dialog = new SyncNozzleAndAmsDialog(temp_na_info); } m_sna_dialog->on_show(); }); @@ -3221,7 +3221,7 @@ void Sidebar::pop_finsish_sync_ams_dialog() if (m_sna_dialog) { m_sna_dialog->on_hide(); } m_fna_dialog->update_info(temp_fsa_info); } else { - m_fna_dialog = std::make_shared(temp_fsa_info); + m_fna_dialog = new FinishSyncAmsDialog(temp_fsa_info); } m_fna_dialog->on_show(); }); diff --git a/src/slic3r/GUI/Plater.hpp b/src/slic3r/GUI/Plater.hpp index 277d504088..b77d2bd314 100644 --- a/src/slic3r/GUI/Plater.hpp +++ b/src/slic3r/GUI/Plater.hpp @@ -130,13 +130,13 @@ class Sidebar : public wxPanel Button * btn_sync{nullptr}; ScalableButton * ams_btn{nullptr}; bool m_last_slice_state = false; - std::shared_ptr m_sna_dialog{nullptr}; - std::shared_ptr m_fna_dialog{nullptr}; + SyncNozzleAndAmsDialog* m_sna_dialog{nullptr}; + FinishSyncAmsDialog* m_fna_dialog{nullptr}; std::vector m_cur_combox_bed_types; std::string m_cur_image_bed_type; int m_last_combo_bedtype_count{0}; bool m_begin_sync_printer_status{false}; - std::shared_ptr m_sync_dlg{nullptr}; + SyncAmsInfoDialog* m_sync_dlg{nullptr}; void update_sync_ams_btn_enable(wxUpdateUIEvent &e);