diff --git a/gui/builtinViews/emptyView.py b/gui/builtinViews/emptyView.py index 845364fd1..ad115a841 100644 --- a/gui/builtinViews/emptyView.py +++ b/gui/builtinViews/emptyView.py @@ -18,7 +18,7 @@ class BlankPage(wx.Panel): wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=None)) def Destroy(self): - self.parent.Unbind(EVT_NOTEBOOK_PAGE_CHANGED, handler=self.pageChanged) + self.parent.Unbind(EVT_NOTEBOOK_PAGE_CHANGED) wx.Panel.Destroy(self) def pageChanged(self, event): diff --git a/gui/builtinViews/fittingView.py b/gui/builtinViews/fittingView.py index 22d06fa8d..b8132ace8 100644 --- a/gui/builtinViews/fittingView.py +++ b/gui/builtinViews/fittingView.py @@ -216,11 +216,11 @@ class FittingView(d.Display): wx.PostEvent(self.mainFrame, FitSelected(fitID=fitID)) def Destroy(self): - self.parent.Unbind(EVT_NOTEBOOK_PAGE_CHANGED, handler=self.pageChanged) - self.mainFrame.Unbind(GE.FIT_CHANGED, handler=self.fitChanged) - self.mainFrame.Unbind(EVT_FIT_RENAMED, handler=self.fitRenamed) - self.mainFrame.Unbind(EVT_FIT_REMOVED, handler=self.fitRemoved) - self.mainFrame.Unbind(ITEM_SELECTED, handler=self.appendItem) + self.parent.Unbind(EVT_NOTEBOOK_PAGE_CHANGED) + self.mainFrame.Unbind(GE.FIT_CHANGED) + self.mainFrame.Unbind(EVT_FIT_RENAMED) + self.mainFrame.Unbind(EVT_FIT_REMOVED) + self.mainFrame.Unbind(ITEM_SELECTED) d.Display.Destroy(self) diff --git a/gui/crestFittings.py b/gui/crestFittings.py index 13df6fd2f..71cc00c02 100644 --- a/gui/crestFittings.py +++ b/gui/crestFittings.py @@ -128,8 +128,8 @@ class CrestFittings(wx.Frame): event.Skip() # continue event def OnClose(self, event): - self.mainFrame.Unbind(GE.EVT_SSO_LOGOUT, handler=self.ssoLogout) - self.mainFrame.Unbind(GE.EVT_SSO_LOGIN, handler=self.ssoLogin) + self.mainFrame.Unbind(GE.EVT_SSO_LOGOUT) + self.mainFrame.Unbind(GE.EVT_SSO_LOGIN) event.Skip() def getActiveCharacter(self): @@ -255,7 +255,7 @@ class ExportToEve(wx.Frame): event.Skip() # continue event def OnClose(self, event): - self.mainFrame.Unbind(GE.EVT_SSO_LOGOUT, handler=self.ssoLogout) + self.mainFrame.Unbind(GE.EVT_SSO_LOGOUT) event.Skip() def getActiveCharacter(self): diff --git a/gui/graphFrame.py b/gui/graphFrame.py index a4d5fdd75..1ecf2daca 100644 --- a/gui/graphFrame.py +++ b/gui/graphFrame.py @@ -170,8 +170,8 @@ class GraphFrame(wx.Frame): self.AppendFitToList(fitID) def close(self, event): - self.fitList.fitList.Unbind(wx.EVT_LEFT_DCLICK, handler=self.removeItem) - print(self.mainFrame.Unbind(GE.FIT_CHANGED, handler=self.draw)) + self.fitList.fitList.Unbind(wx.EVT_LEFT_DCLICK) + self.mainFrame.Unbind(GE.FIT_CHANGED) event.Skip() def getView(self):