diff --git a/gui/characterEditor.py b/gui/characterEditor.py index c1fe109f8..a9eff4a5e 100644 --- a/gui/characterEditor.py +++ b/gui/characterEditor.py @@ -122,17 +122,6 @@ class CharacterEditor(wx.Frame): self.registerEvents() self.mainFrame = gui.mainFrame.MainFrame.getInstance() - hiddenMenu = wx.Menu() - hiddenMenu.Append(9912,"Close window") - self.Bind(wx.EVT_MENU,self.HCloseWindow, id = 9913) - actb = [(wx.ACCEL_CTRL, ord('W'), 9913), - (wx.ACCEL_CMD, ord('W'), 9913)] - atable = wx.AcceleratorTable(actb) - self.SetAcceleratorTable(atable) - - def HCloseWindow(self,event): - self.Destroy() - event.Skip() def editingFinished(self, event): wx.PostEvent(self.mainFrame, CharListUpdated()) diff --git a/gui/importExport.py b/gui/importExport.py index 5aecae740..428b36314 100644 --- a/gui/importExport.py +++ b/gui/importExport.py @@ -86,17 +86,6 @@ class ImportDialog(wx.Dialog): self.btnImport.Bind( wx.EVT_BUTTON, self.ImportFittings ) self.Centre(wx.BOTH) - hiddenMenu = wx.Menu() - hiddenMenu.Append(9915,"Close window") - self.Bind(wx.EVT_MENU,self.HCloseWindow, id = 9915) - actb = [(wx.ACCEL_CTRL, ord('W'), 9915), - (wx.ACCEL_CMD, ord('W'), 9915)] - atable = wx.AcceleratorTable(actb) - self.SetAcceleratorTable(atable) - - def HCloseWindow(self,event): - self.Destroy() - event.Skip() def ImportFittings( self, event ): sFit = service.Fit.getInstance() @@ -223,18 +212,8 @@ class ExportDialog ( wx.Dialog ): self.btnExport.Bind( wx.EVT_BUTTON, self.ExportFit ) self.chCtrl.Bind( wx.EVT_RADIOBOX, self.OnExtSelect ) - hiddenMenu = wx.Menu() - hiddenMenu.Append(9916,"Close window") - self.Bind(wx.EVT_MENU,self.HCloseWindow, id = 9916) - actb = [(wx.ACCEL_CTRL, ord('W'), 9916), - (wx.ACCEL_CMD, ord('W'), 9916)] - atable = wx.AcceleratorTable(actb) - self.SetAcceleratorTable(atable) - - def HCloseWindow(self,event): - self.Destroy() - event.Skip() + # Virtual event handlers, overide them in your derived class def OnExtSelect( self, event ): # selection = self.chCtrl.GetSelection() # if selection == 0: diff --git a/gui/itemStats.py b/gui/itemStats.py index 9ef7b5ead..1d508646e 100644 --- a/gui/itemStats.py +++ b/gui/itemStats.py @@ -87,19 +87,6 @@ class ItemStatsDialog(wx.Dialog): self.Show() self.Bind(wx.EVT_CLOSE, self.closeEvent) - hiddenMenu = wx.Menu() - hiddenMenu.Append(9912,"Close window") - self.Bind(wx.EVT_MENU,self.HCloseWindow, id = 9912) - actb = [(wx.ACCEL_CTRL, ord('W'), 9912), - (wx.ACCEL_CMD, ord('W'), 9912)] - atable = wx.AcceleratorTable(actb) - self.SetAcceleratorTable(atable) - - def HCloseWindow(self,event): - if self.dlgOrder==ItemStatsDialog.counter: - ItemStatsDialog.counter -= 1 - self.Destroy() - event.Skip() def closeEvent(self, event): diff --git a/gui/patternEditor.py b/gui/patternEditor.py index 004135391..60e253c59 100644 --- a/gui/patternEditor.py +++ b/gui/patternEditor.py @@ -180,18 +180,6 @@ class DmgPatternEditorDlg (wx.Dialog): self.patternChanged() - hiddenMenu = wx.Menu() - hiddenMenu.Append(9914,"Close window") - self.Bind(wx.EVT_MENU,self.HCloseWindow, id = 9914) - actb = [(wx.ACCEL_CTRL, ord('W'), 9914), - (wx.ACCEL_CMD, ord('W'), 9914)] - atable = wx.AcceleratorTable(actb) - self.SetAcceleratorTable(atable) - - def HCloseWindow(self,event): - self.Destroy() - event.Skip() - def ValuesUpdated(self, event=None): if self.block: return