From 57a7425b0fc096ea102c86da96aecc1ddcbda35b Mon Sep 17 00:00:00 2001 From: bubnikv <bubnikv@gmail.com> Date: Thu, 16 May 2019 16:06:57 +0200 Subject: [PATCH] Fix of New assertion failure with 2.0.0rc #2250 Calls to Dialog::Close() after Dialog::EndModal() were removed. --- src/slic3r/GUI/AboutDialog.cpp | 1 - src/slic3r/GUI/ConfigSnapshotDialog.cpp | 2 -- src/slic3r/GUI/GUI_App.cpp | 2 -- src/slic3r/GUI/KBShortcutsDialog.cpp | 1 - src/slic3r/GUI/Preferences.cpp | 1 - src/slic3r/GUI/SysInfoDialog.cpp | 3 +-- 6 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/slic3r/GUI/AboutDialog.cpp b/src/slic3r/GUI/AboutDialog.cpp index c60732fda..08f2123bb 100644 --- a/src/slic3r/GUI/AboutDialog.cpp +++ b/src/slic3r/GUI/AboutDialog.cpp @@ -163,7 +163,6 @@ void AboutDialog::onLinkClicked(wxHtmlLinkEvent &event) void AboutDialog::onCloseDialog(wxEvent &) { this->EndModal(wxID_CLOSE); - this->Close(); } } // namespace GUI diff --git a/src/slic3r/GUI/ConfigSnapshotDialog.cpp b/src/slic3r/GUI/ConfigSnapshotDialog.cpp index f905941f3..59ed38412 100644 --- a/src/slic3r/GUI/ConfigSnapshotDialog.cpp +++ b/src/slic3r/GUI/ConfigSnapshotDialog.cpp @@ -159,13 +159,11 @@ void ConfigSnapshotDialog::onLinkClicked(wxHtmlLinkEvent &event) { m_snapshot_to_activate = event.GetLinkInfo().GetHref(); this->EndModal(wxID_CLOSE); - this->Close(); } void ConfigSnapshotDialog::onCloseDialog(wxEvent &) { this->EndModal(wxID_CLOSE); - this->Close(); } } // namespace GUI diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index cb8a459af..fd5a3e9f0 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -442,14 +442,12 @@ void GUI_App::system_info() { SysInfoDialog dlg; dlg.ShowModal(); - dlg.Destroy(); } void GUI_App::keyboard_shortcuts() { KBShortcutsDialog dlg; dlg.ShowModal(); - dlg.Destroy(); } // static method accepting a wxWindow object as first parameter diff --git a/src/slic3r/GUI/KBShortcutsDialog.cpp b/src/slic3r/GUI/KBShortcutsDialog.cpp index a7b011013..474521ee7 100644 --- a/src/slic3r/GUI/KBShortcutsDialog.cpp +++ b/src/slic3r/GUI/KBShortcutsDialog.cpp @@ -211,7 +211,6 @@ void KBShortcutsDialog::on_dpi_changed(const wxRect &suggested_rect) void KBShortcutsDialog::onCloseDialog(wxEvent &) { this->EndModal(wxID_CLOSE); - this->Close(); } } // namespace GUI diff --git a/src/slic3r/GUI/Preferences.cpp b/src/slic3r/GUI/Preferences.cpp index ea36231de..a29ba5c91 100644 --- a/src/slic3r/GUI/Preferences.cpp +++ b/src/slic3r/GUI/Preferences.cpp @@ -136,7 +136,6 @@ void PreferencesDialog::accept() } EndModal(wxID_OK); - Close(); // needed on Linux // Nothify the UI to update itself from the ini file. wxGetApp().update_ui_from_settings(); diff --git a/src/slic3r/GUI/SysInfoDialog.cpp b/src/slic3r/GUI/SysInfoDialog.cpp index 052a5c12a..bd19c38c3 100644 --- a/src/slic3r/GUI/SysInfoDialog.cpp +++ b/src/slic3r/GUI/SysInfoDialog.cpp @@ -117,7 +117,7 @@ SysInfoDialog::SysInfoDialog() } wxStdDialogButtonSizer* buttons = this->CreateStdDialogButtonSizer(wxOK); - m_btn_copy_to_clipboard = new wxButton(this, wxID_ANY, "Copy to Clipboard", wxDefaultPosition, wxDefaultSize); + m_btn_copy_to_clipboard = new wxButton(this, wxID_ANY, _(L("Copy to Clipboard")), wxDefaultPosition, wxDefaultSize); buttons->Insert(0, m_btn_copy_to_clipboard, 0, wxLEFT, 5); m_btn_copy_to_clipboard->Bind(wxEVT_BUTTON, &SysInfoDialog::onCopyToClipboard, this); @@ -172,7 +172,6 @@ void SysInfoDialog::onCopyToClipboard(wxEvent &) void SysInfoDialog::onCloseDialog(wxEvent &) { this->EndModal(wxID_CLOSE); - this->Close(); } } // namespace GUI