From bb02d0f0ae9b9a04c01a4db54bdd0ad0f6c1e706 Mon Sep 17 00:00:00 2001 From: "chunmao.guo" Date: Fri, 30 Sep 2022 16:16:28 +0800 Subject: [PATCH] FIX: close GuideFrame on exit to fix crash on MacOS Change-Id: Ia9c6103961ce13c3f88f898ed449a3f8f299858d --- src/slic3r/GUI/WebGuideDialog.cpp | 2 +- src/slic3r/GUI/WebGuideDialog.hpp | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/slic3r/GUI/WebGuideDialog.cpp b/src/slic3r/GUI/WebGuideDialog.cpp index f544bb61a..13affe573 100644 --- a/src/slic3r/GUI/WebGuideDialog.cpp +++ b/src/slic3r/GUI/WebGuideDialog.cpp @@ -35,7 +35,7 @@ namespace Slic3r { namespace GUI { json m_ProfileJson; GuideFrame::GuideFrame(GUI_App *pGUI, long style) - : wxDialog((wxWindow *) (pGUI->mainframe), wxID_ANY, "BambuStudio", wxDefaultPosition, wxDefaultSize, style), + : DPIDialog((wxWindow *) (pGUI->mainframe), wxID_ANY, "BambuStudio", wxDefaultPosition, wxDefaultSize, style), m_appconfig_new() { // INI diff --git a/src/slic3r/GUI/WebGuideDialog.hpp b/src/slic3r/GUI/WebGuideDialog.hpp index de7727663..f1da60b51 100644 --- a/src/slic3r/GUI/WebGuideDialog.hpp +++ b/src/slic3r/GUI/WebGuideDialog.hpp @@ -34,7 +34,7 @@ namespace Slic3r { namespace GUI { -class GuideFrame : public wxDialog +class GuideFrame : public DPIDialog { public: GuideFrame(GUI_App *pGUI, long style = wxCAPTION | wxCLOSE_BOX | wxSYSTEM_MENU); @@ -92,6 +92,8 @@ public: int InstallPlugin(); int ShowPluginStatus(int status, int percent, bool &cancel); + void on_dpi_changed(const wxRect &suggested_rect) {} + private: GUI_App *m_MainPtr; AppConfig m_appconfig_new;