From 9fc31d6a55f1c33f7fcc893085d7b063227a3c34 Mon Sep 17 00:00:00 2001 From: blitzmann Date: Mon, 25 Jan 2016 22:47:27 -0500 Subject: [PATCH] Fix Character Editor Dialog for osx --- gui/characterEditor.py | 8 ++------ gui/mainFrame.py | 1 + 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/gui/characterEditor.py b/gui/characterEditor.py index 0fe9b37f6..8fa9a23b2 100644 --- a/gui/characterEditor.py +++ b/gui/characterEditor.py @@ -127,7 +127,7 @@ class CharacterEditor(wx.Dialog): self.btnSaveChar.Bind(wx.EVT_BUTTON, self.saveChar) self.btnSaveAs.Bind(wx.EVT_BUTTON, self.saveCharAs) self.btnRevert.Bind(wx.EVT_BUTTON, self.revertChar) - self.btnOK.Bind(wx.EVT_BUTTON, self.editingFinished) + self.btnOK.Bind(wx.EVT_BUTTON, self.OnClose) mainSizer.Add(bSizerButtons, 0, wx.EXPAND, 5) @@ -167,10 +167,6 @@ class CharacterEditor(wx.Dialog): self.btnRestrict() - def editingFinished(self, event): - wx.PostEvent(self.mainFrame, GE.CharListUpdated()) - self.Close() - def registerEvents(self): self.Bind(wx.EVT_CLOSE, self.OnClose) self.Bind(GE.CHAR_LIST_UPDATED, self.refreshCharacterList) @@ -319,7 +315,7 @@ class CharacterEditor(wx.Dialog): sFit.clearFit(fitID) wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID)) - self.Destroy() + event.Skip() class SkillTreeView (wx.Panel): def __init__(self, parent): diff --git a/gui/mainFrame.py b/gui/mainFrame.py index 040872d64..93c92dc86 100644 --- a/gui/mainFrame.py +++ b/gui/mainFrame.py @@ -351,6 +351,7 @@ class MainFrame(wx.Frame): def showCharacterEditor(self, event): dlg=CharacterEditor(self) dlg.ShowModal() + dlg.Destroy() def showAttrEditor(self, event): dlg=AttributeEditor(self)