diff --git a/src/slic3r/GUI/StatusPanel.cpp b/src/slic3r/GUI/StatusPanel.cpp index 34f7cab76..7842eb436 100644 --- a/src/slic3r/GUI/StatusPanel.cpp +++ b/src/slic3r/GUI/StatusPanel.cpp @@ -4812,7 +4812,7 @@ void StatusPanel::on_nozzle_fan_switch(wxCommandEvent &event) } m_fan_control_popup->SetPosition(pos); - m_fan_control_popup->Popup(); + m_fan_control_popup->ShowModal(); diff --git a/src/slic3r/GUI/Widgets/FanControl.cpp b/src/slic3r/GUI/Widgets/FanControl.cpp index 813a66ff5..356e4dba6 100644 --- a/src/slic3r/GUI/Widgets/FanControl.cpp +++ b/src/slic3r/GUI/Widgets/FanControl.cpp @@ -588,7 +588,7 @@ Description:FanControlPopupNew **************************************************/ static void nop_deleter_fan_control_popup(FanControlPopupNew *) {} FanControlPopupNew::FanControlPopupNew(wxWindow* parent, MachineObject* obj, const AirDuctData& data) - : PopupWindow(parent, wxBORDER_NONE) + : wxDialog(parent, wxID_ANY, wxEmptyString) { SetBackgroundColour(*wxWHITE); init_names(); @@ -848,10 +848,6 @@ void FanControlPopupNew::on_left_down(wxMouseEvent& evt) evt.Skip(); } -void FanControlPopupNew::OnDismiss() -{ -} - void FanControlPopupNew::post_event(int fan_type, wxString speed) { // id, speed @@ -863,11 +859,6 @@ void FanControlPopupNew::post_event(int fan_type, wxString speed) event.Skip(); } -bool FanControlPopupNew::ProcessLeftDown(wxMouseEvent& event) -{ - return PopupWindow::ProcessLeftDown(event); -} - void FanControlPopupNew::on_show(wxShowEvent& evt) { wxGetApp().UpdateDarkUIWin(this); diff --git a/src/slic3r/GUI/Widgets/FanControl.hpp b/src/slic3r/GUI/Widgets/FanControl.hpp index afaf77081..1a8744204 100644 --- a/src/slic3r/GUI/Widgets/FanControl.hpp +++ b/src/slic3r/GUI/Widgets/FanControl.hpp @@ -174,7 +174,7 @@ public: }; -class FanControlPopupNew : public PopupWindow +class FanControlPopupNew : public wxDialog { public: FanControlPopupNew(wxWindow* parent, MachineObject* obj, const AirDuctData& data); @@ -248,8 +248,6 @@ public: void post_event(int fan_type, wxString speed); void on_show(wxShowEvent& evt); void command_control_air_duct(int mode_id); - virtual void OnDismiss() wxOVERRIDE; - virtual bool ProcessLeftDown(wxMouseEvent& event) wxOVERRIDE; }; wxDECLARE_EVENT(EVT_FAN_SWITCH_ON, wxCommandEvent); wxDECLARE_EVENT(EVT_FAN_SWITCH_OFF, wxCommandEvent);