3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed a crash on language changing

Browse Source 
(DiffPresetDialog should get mainframe as a parent explicitly)
This commit is contained in:
YuSanka 2021-02-09 09:55:26 +01:00
parent 0b4720338f
commit e833e63c42
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/slic3r/GUI/MainFrame.cpp
View File

@ -116,6 +116,7 @@ DPIFrame(NULL, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_S
m_printhost_queue_dlg(new PrintHostQueueDialog(this)) m_printhost_queue_dlg(new PrintHostQueueDialog(this))
, m_recent_projects(9) , m_recent_projects(9)
, m_settings_dialog(this) , m_settings_dialog(this)
, diff_dialog(this)
{ {
// Fonts were created by the DPIFrame constructor for the monitor, on which the window opened. // Fonts were created by the DPIFrame constructor for the monitor, on which the window opened.
wxGetApp().update_fonts(this); wxGetApp().update_fonts(this);

4
src/slic3r/GUI/UnsavedChangesDialog.cpp
View File

@ -1386,8 +1386,8 @@ static std::string get_selection(PresetComboBox* preset_combo)
return into_u8(preset_combo->GetString(preset_combo->GetSelection())); return into_u8(preset_combo->GetString(preset_combo->GetSelection()));
} }
DiffPresetDialog::DiffPresetDialog() DiffPresetDialog::DiffPresetDialog(MainFrame* mainframe)
: DPIDialog(static_cast<wxWindow*>(wxGetApp().mainframe), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER), : DPIDialog(mainframe, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER),
m_pr_technology(wxGetApp().preset_bundle->printers.get_edited_preset().printer_technology()) m_pr_technology(wxGetApp().preset_bundle->printers.get_edited_preset().printer_technology())
{ {
wxColour bgr_clr = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW); wxColour bgr_clr = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);

3
src/slic3r/GUI/UnsavedChangesDialog.hpp
View File

@ -21,6 +21,7 @@ namespace GUI{
class ModelNode; class ModelNode;
class PresetComboBox; class PresetComboBox;
class MainFrame;
using ModelNodePtrArray = std::vector<std::unique_ptr<ModelNode>>; using ModelNodePtrArray = std::vector<std::unique_ptr<ModelNode>>;
// On all of 3 different platforms Bitmap+Text icon column looks different // On all of 3 different platforms Bitmap+Text icon column looks different
@ -333,7 +334,7 @@ class DiffPresetDialog : public DPIDialog
std::vector<DiffPresets> m_preset_combos; std::vector<DiffPresets> m_preset_combos;
public: public:
DiffPresetDialog(); DiffPresetDialog(MainFrame* mainframe);
~DiffPresetDialog() {} ~DiffPresetDialog() {}
void show(Preset::Type type = Preset::TYPE_INVALID); void show(Preset::Type type = Preset::TYPE_INVALID);