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

Fix memory leak in ProgressStatusBar

Browse source
This commit is contained in:
tamasmeszaros 2019-07-30 17:52:05 +02:00
parent ca1c78b3fc
commit cc5d74084c
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/slic3r/GUI/ProgressStatusBar.cpp
View file

@ -14,20 +14,20 @@
namespace Slic3r {
ProgressStatusBar::ProgressStatusBar(wxWindow *parent, int id):
self(new wxStatusBar(parent ? parent : GUI::wxGetApp().mainframe,
id == -1? wxID_ANY : id)),
m_timer(new wxTimer(self)),
m_prog (new wxGauge(self,
wxGA_HORIZONTAL,
100,
wxDefaultPosition,
wxDefaultSize)),
m_cancelbutton(new wxButton(self,
-1,
_(L("Cancel")),
wxDefaultPosition,
wxDefaultSize))
ProgressStatusBar::ProgressStatusBar(wxWindow *parent, int id)
: self{new wxStatusBar(parent ? parent : GUI::wxGetApp().mainframe,
id == -1 ? wxID_ANY : id)}
, m_prog{new wxGauge(self,
wxGA_HORIZONTAL,
100,
wxDefaultPosition,
wxDefaultSize)}
, m_cancelbutton{new wxButton(self,
-1,
_(L("Cancel")),
wxDefaultPosition,
wxDefaultSize)}
, m_timer{new wxTimer(self)}
{
m_prog->Hide();
m_cancelbutton->Hide();

2
src/slic3r/GUI/ProgressStatusBar.hpp
View file

@ -25,9 +25,9 @@ namespace Slic3r {
class ProgressStatusBar
{
wxStatusBar *self; // we cheat! It should be the base class but: perl!
wxTimer *m_timer;
wxGauge *m_prog;
wxButton *m_cancelbutton;
std::unique_ptr<wxTimer> m_timer;
public:
/// Cancel callback function type