diff options
Diffstat (limited to 'lib/gui/tartan/main_panel.py')
| -rw-r--r-- | lib/gui/tartan/main_panel.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/lib/gui/tartan/main_panel.py b/lib/gui/tartan/main_panel.py index 74087426..34015fb4 100644 --- a/lib/gui/tartan/main_panel.py +++ b/lib/gui/tartan/main_panel.py @@ -25,11 +25,10 @@ from . import CodePanel, CustomizePanel, EmbroideryPanel, HelpPanel class TartanMainPanel(wx.Panel): - def __init__(self, parent, simulator, elements, on_cancel=None, metadata=None, background_color='white'): + def __init__(self, parent, simulator, elements, metadata=None, background_color='white'): self.parent = parent self.simulator = simulator self.elements = elements - self.cancel_hook = on_cancel self.palette = Palette() self.metadata = metadata or dict() self.background_color = background_color @@ -195,12 +194,12 @@ class TartanMainPanel(wx.Panel): return "tartan" def close(self): - self.GetTopLevelParent().Close() + self.simulator.stop() + wx.CallAfter(self.GetTopLevelParent().close) def cancel(self, event): - if self.cancel_hook: - self.cancel_hook() - self.close() + self.simulator.stop() + wx.CallAfter(self.GetTopLevelParent().cancel) def apply(self, event): self.update_tartan() |