From 5e0a5da6d53dcb12c83958cf6cf8e1dcf1e19926 Mon Sep 17 00:00:00 2001 From: blitzmann Date: Thu, 23 Nov 2017 12:51:43 -0500 Subject: [PATCH] more post-merge work --- gui/shipBrowser.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gui/shipBrowser.py b/gui/shipBrowser.py index 6566e8ef2..7163a3830 100644 --- a/gui/shipBrowser.py +++ b/gui/shipBrowser.py @@ -11,7 +11,7 @@ from gui.builtinShipBrowser.shipItem import ShipItem from service.fit import Fit from service.market import Market -import gui.builtinShipBrowser.events as events +from gui.builtinShipBrowser.events import * from gui.builtinShipBrowser.pfWidgetContainer import PFWidgetsContainer from gui.builtinShipBrowser.navigationPanel import NavigationPanel from gui.builtinShipBrowser.raceSelector import RaceSelector @@ -76,11 +76,11 @@ class ShipBrowser(wx.Panel): self.Show() self.Bind(wx.EVT_SIZE, self.SizeRefreshList) - self.Bind(events.EVT_SB_STAGE2_SEL, self.stage2) - self.Bind(events.EVT_SB_STAGE1_SEL, self.stage1) - self.Bind(events.EVT_SB_STAGE3_SEL, self.stage3) - self.Bind(events.EVT_SB_SEARCH_SEL, self.searchStage) - self.Bind(events.EVT_SB_IMPORT_SEL, self.importStage) + self.Bind(EVT_SB_STAGE2_SEL, self.stage2) + self.Bind(EVT_SB_STAGE1_SEL, self.stage1) + self.Bind(EVT_SB_STAGE3_SEL, self.stage3) + self.Bind(EVT_SB_SEARCH_SEL, self.searchStage) + self.Bind(EVT_SB_IMPORT_SEL, self.importStage) self.mainFrame.Bind(GE.FIT_CHANGED, self.RefreshList)