From 1cbd8ee9014cca1c950be799dc4c5554623531e9 Mon Sep 17 00:00:00 2001 From: Ryan Holmes Date: Mon, 12 Jun 2017 21:31:37 -0400 Subject: [PATCH] Fix some deprecated stuff --- gui/builtinAdditionPanes/boosterView.py | 4 ++-- gui/builtinAdditionPanes/cargoView.py | 6 +++--- gui/builtinAdditionPanes/commandView.py | 6 +++--- gui/builtinAdditionPanes/droneView.py | 6 +++--- gui/builtinAdditionPanes/fighterView.py | 6 +++--- gui/builtinAdditionPanes/projectedView.py | 6 +++--- gui/builtinMarketBrowser/itemView.py | 2 +- gui/builtinShipBrowser/fitItem.py | 4 ++-- gui/builtinShipBrowser/navigationPanel.py | 8 ++++---- gui/builtinShipBrowser/pfBitmapFrame.py | 2 +- gui/builtinShipBrowser/raceSelector.py | 6 +++--- gui/builtinShipBrowser/shipItem.py | 4 ++-- gui/builtinViews/fittingView.py | 6 +++--- gui/mainMenuBar.py | 14 +++++++------- gui/utils/draw.py | 4 ++-- wxthing.py | 2 +- 16 files changed, 43 insertions(+), 43 deletions(-) diff --git a/gui/builtinAdditionPanes/boosterView.py b/gui/builtinAdditionPanes/boosterView.py index c1b4748c8..67b690ba1 100644 --- a/gui/builtinAdditionPanes/boosterView.py +++ b/gui/builtinAdditionPanes/boosterView.py @@ -28,12 +28,12 @@ from gui.utils.staticHelpers import DragDropHelper from service.fit import Fit -class BoosterViewDrop(wx.PyDropTarget): +class BoosterViewDrop(wx.DropTarget): def __init__(self, dropFn, *args, **kwargs): super(BoosterViewDrop, self).__init__(*args, **kwargs) self.dropFn = dropFn # this is really transferring an EVE itemID - self.dropData = wx.PyTextDataObject() + self.dropData = wx.TextDataObject() self.SetDataObject(self.dropData) def OnData(self, x, y, t): diff --git a/gui/builtinAdditionPanes/cargoView.py b/gui/builtinAdditionPanes/cargoView.py index 742ff11b1..5ea6c56d6 100644 --- a/gui/builtinAdditionPanes/cargoView.py +++ b/gui/builtinAdditionPanes/cargoView.py @@ -28,12 +28,12 @@ from service.fit import Fit from service.market import Market -class CargoViewDrop(wx.PyDropTarget): +class CargoViewDrop(wx.DropTarget): def __init__(self, dropFn, *args, **kwargs): super(CargoViewDrop, self).__init__(*args, **kwargs) self.dropFn = dropFn # this is really transferring an EVE itemID - self.dropData = wx.PyTextDataObject() + self.dropData = wx.TextDataObject() self.SetDataObject(self.dropData) def OnData(self, x, y, t): @@ -88,7 +88,7 @@ class CargoView(d.Display): row = event.GetIndex() if row != -1: - data = wx.PyTextDataObject() + data = wx.TextDataObject() dataStr = "cargo:" + str(row) data.SetText(dataStr) diff --git a/gui/builtinAdditionPanes/commandView.py b/gui/builtinAdditionPanes/commandView.py index db7b916d2..697953995 100644 --- a/gui/builtinAdditionPanes/commandView.py +++ b/gui/builtinAdditionPanes/commandView.py @@ -42,12 +42,12 @@ class DummyEntry(object): self.item = DummyItem(txt) -class CommandViewDrop(wx.PyDropTarget): +class CommandViewDrop(wx.DropTarget): def __init__(self, dropFn, *args, **kwargs): super(CommandViewDrop, self).__init__(*args, **kwargs) self.dropFn = dropFn # this is really transferring an EVE itemID - self.dropData = wx.PyTextDataObject() + self.dropData = wx.TextDataObject() self.SetDataObject(self.dropData) def OnData(self, x, y, t): @@ -117,7 +117,7 @@ class CommandView(d.Display): def startDrag(self, event): row = event.GetIndex() if row != -1 and isinstance(self.get(row), es_Drone): - data = wx.PyTextDataObject() + data = wx.TextDataObject() dataStr = "command:" + str(self.GetItemData(row)) data.SetText(dataStr) diff --git a/gui/builtinAdditionPanes/droneView.py b/gui/builtinAdditionPanes/droneView.py index 7fde0a105..b03426e31 100644 --- a/gui/builtinAdditionPanes/droneView.py +++ b/gui/builtinAdditionPanes/droneView.py @@ -30,12 +30,12 @@ from service.fit import Fit from service.market import Market -class DroneViewDrop(wx.PyDropTarget): +class DroneViewDrop(wx.DropTarget): def __init__(self, dropFn, *args, **kwargs): super(DroneViewDrop, self).__init__(*args, **kwargs) self.dropFn = dropFn # this is really transferring an EVE itemID - self.dropData = wx.PyTextDataObject() + self.dropData = wx.TextDataObject() self.SetDataObject(self.dropData) def OnData(self, x, y, t): @@ -123,7 +123,7 @@ class DroneView(Display): def startDrag(self, event): row = event.GetIndex() if row != -1: - data = wx.PyTextDataObject() + data = wx.TextDataObject() dataStr = "drone:" + str(row) data.SetText(dataStr) diff --git a/gui/builtinAdditionPanes/fighterView.py b/gui/builtinAdditionPanes/fighterView.py index 2d1ee4c17..df3c5715b 100644 --- a/gui/builtinAdditionPanes/fighterView.py +++ b/gui/builtinAdditionPanes/fighterView.py @@ -32,12 +32,12 @@ from service.fit import Fit from service.market import Market -class FighterViewDrop(wx.PyDropTarget): +class FighterViewDrop(wx.DropTarget): def __init__(self, dropFn, *args, **kwargs): super(FighterViewDrop, self).__init__(*args, **kwargs) self.dropFn = dropFn # this is really transferring an EVE itemID - self.dropData = wx.PyTextDataObject() + self.dropData = wx.TextDataObject() self.SetDataObject(self.dropData) def OnData(self, x, y, t): @@ -186,7 +186,7 @@ class FighterDisplay(d.Display): def startDrag(self, event): row = event.GetIndex() if row != -1: - data = wx.PyTextDataObject() + data = wx.TextDataObject() dataStr = "fighter:" + str(row) data.SetText(dataStr) diff --git a/gui/builtinAdditionPanes/projectedView.py b/gui/builtinAdditionPanes/projectedView.py index 0e4176eed..b209da974 100644 --- a/gui/builtinAdditionPanes/projectedView.py +++ b/gui/builtinAdditionPanes/projectedView.py @@ -47,12 +47,12 @@ class DummyEntry(object): self.item = DummyItem(txt) -class ProjectedViewDrop(wx.PyDropTarget): +class ProjectedViewDrop(wx.DropTarget): def __init__(self, dropFn, *args, **kwargs): super(ProjectedViewDrop, self).__init__(*args, **kwargs) self.dropFn = dropFn # this is really transferring an EVE itemID - self.dropData = wx.PyTextDataObject() + self.dropData = wx.TextDataObject() self.SetDataObject(self.dropData) def OnData(self, x, y, t): @@ -132,7 +132,7 @@ class ProjectedView(d.Display): def startDrag(self, event): row = event.GetIndex() if row != -1 and isinstance(self.get(row), es_Drone): - data = wx.PyTextDataObject() + data = wx.TextDataObject() dataStr = "projected:" + str(self.GetItemData(row)) data.SetText(dataStr) diff --git a/gui/builtinMarketBrowser/itemView.py b/gui/builtinMarketBrowser/itemView.py index 71aa5b125..a18565a27 100644 --- a/gui/builtinMarketBrowser/itemView.py +++ b/gui/builtinMarketBrowser/itemView.py @@ -66,7 +66,7 @@ class ItemView(Display): row = self.GetFirstSelected() if row != -1: - data = wx.PyTextDataObject() + data = wx.TextDataObject() dataStr = "market:" + str(self.active[row].ID) pyfalog.debug("Dragging from market: " + dataStr) diff --git a/gui/builtinShipBrowser/fitItem.py b/gui/builtinShipBrowser/fitItem.py index be3bf0e1d..053d8b595 100644 --- a/gui/builtinShipBrowser/fitItem.py +++ b/gui/builtinShipBrowser/fitItem.py @@ -72,9 +72,9 @@ class FitItem(SFItem.SFBrowserItem): self.acceptBmp = BitmapLoader.getBitmap("faccept_small", "gui") self.shipEffBk = BitmapLoader.getBitmap("fshipbk_big", "gui") - img = wx.ImageFromBitmap(self.shipEffBk) + img = self.shipEffBk.ConvertToImage() img = img.Mirror(False) - self.shipEffBkMirrored = wx.BitmapFromImage(img) + self.shipEffBkMirrored = wx.Bitmap(img) self.dragTLFBmp = None diff --git a/gui/builtinShipBrowser/navigationPanel.py b/gui/builtinShipBrowser/navigationPanel.py index 69989389b..ff63792b5 100644 --- a/gui/builtinShipBrowser/navigationPanel.py +++ b/gui/builtinShipBrowser/navigationPanel.py @@ -29,11 +29,11 @@ class NavigationPanel(SFItem.SFBrowserItem): switchImg = BitmapLoader.getImage("fit_switch_view_mode_small", "gui") switchImg = switchImg.AdjustChannels(1, 1, 1, 0.4) - self.switchBmpD = wx.BitmapFromImage(switchImg) + self.switchBmpD = wx.Bitmap(switchImg) recentImg = BitmapLoader.getImage("frecent_small", "gui") recentImg = recentImg.AdjustChannels(1, 1, 1, 0.4) - self.recentBmpD = wx.BitmapFromImage(recentImg) + self.recentBmpD = wx.Bitmap(recentImg) self.resetBmp = self.AdjustChannels(self.resetBmpH) self.rewBmp = self.AdjustChannels(self.rewBmpH) @@ -184,9 +184,9 @@ class NavigationPanel(SFItem.SFBrowserItem): @staticmethod def AdjustChannels(bitmap): - img = wx.ImageFromBitmap(bitmap) + img = bitmap.ConvertToImage() img = img.AdjustChannels(1.05, 1.05, 1.05, 1) - return wx.BitmapFromImage(img) + return wx.Bitmap(img) def UpdateElementsPos(self, mdc): rect = self.GetRect() diff --git a/gui/builtinShipBrowser/pfBitmapFrame.py b/gui/builtinShipBrowser/pfBitmapFrame.py index e05e643fc..ad09bf337 100644 --- a/gui/builtinShipBrowser/pfBitmapFrame.py +++ b/gui/builtinShipBrowser/pfBitmapFrame.py @@ -7,7 +7,7 @@ class PFBitmapFrame(wx.Frame): style=wx.NO_BORDER | wx.FRAME_NO_TASKBAR | wx.STAY_ON_TOP) img = bitmap.ConvertToImage() img = img.ConvertToGreyscale() - bitmap = wx.BitmapFromImage(img) + bitmap = wx.Bitmap(img) self.bitmap = bitmap self.SetSize((bitmap.GetWidth(), bitmap.GetHeight())) self.Bind(wx.EVT_PAINT, self.OnWindowPaint) diff --git a/gui/builtinShipBrowser/raceSelector.py b/gui/builtinShipBrowser/raceSelector.py index 629140f34..b1231fe6c 100644 --- a/gui/builtinShipBrowser/raceSelector.py +++ b/gui/builtinShipBrowser/raceSelector.py @@ -70,7 +70,7 @@ class RaceSelector(wx.Window): if layout == wx.VERTICAL: img = img.Scale(self.minWidth, 8, wx.IMAGE_QUALITY_HIGH) - self.bmpArrow = wx.BitmapFromImage(img) + self.bmpArrow = wx.Bitmap(img) self.RebuildRaces(self.shipBrowser.RACE_ORDER) @@ -184,12 +184,12 @@ class RaceSelector(wx.Window): if self.shipBrowser.GetRaceFilterState(self.raceNames[self.raceBmps.index(raceBmp)]): bmp = raceBmp else: - img = wx.ImageFromBitmap(raceBmp) + img = raceBmp.ConvertToImage() if self.hoveredItem == self.raceBmps.index(raceBmp): img = img.AdjustChannels(1, 1, 1, 0.7) else: img = img.AdjustChannels(1, 1, 1, 0.4) - bmp = wx.BitmapFromImage(img) + bmp = wx.Bitmap(img) if self.layout == wx.VERTICAL: mdc.DrawBitmap(dropShadow, rect.width - self.buttonsPadding - bmp.GetWidth() + 1, y + 1) diff --git a/gui/builtinShipBrowser/shipItem.py b/gui/builtinShipBrowser/shipItem.py index 254a141c0..8f52c64ee 100644 --- a/gui/builtinShipBrowser/shipItem.py +++ b/gui/builtinShipBrowser/shipItem.py @@ -50,9 +50,9 @@ class ShipItem(SFItem.SFBrowserItem): self.shipEffBk = BitmapLoader.getBitmap("fshipbk_big", "gui") - img = wx.ImageFromBitmap(self.shipEffBk) + img = self.shipEffBk.ConvertToImage() img = img.Mirror(False) - self.shipEffBkMirrored = wx.BitmapFromImage(img) + self.shipEffBkMirrored = wx.Bitmap(img) self.raceBmp = BitmapLoader.getBitmap("race_%s_small" % self.shipRace, "gui") diff --git a/gui/builtinViews/fittingView.py b/gui/builtinViews/fittingView.py index 7734cf634..01e4230b1 100644 --- a/gui/builtinViews/fittingView.py +++ b/gui/builtinViews/fittingView.py @@ -102,12 +102,12 @@ FitSpawner.register() # Drag'n'drop handler -class FittingViewDrop(wx.PyDropTarget): +class FittingViewDrop(wx.DropTarget): def __init__(self, dropFn, *args, **kwargs): super(FittingViewDrop, self).__init__(*args, **kwargs) self.dropFn = dropFn # this is really transferring an EVE itemID - self.dropData = wx.PyTextDataObject() + self.dropData = wx.TextDataObject() self.SetDataObject(self.dropData) def OnData(self, x, y, t): @@ -237,7 +237,7 @@ class FittingView(d.Display): row = event.GetIndex() if row != -1 and row not in self.blanks and isinstance(self.mods[row], Module) and not self.mods[row].isEmpty: - data = wx.PyTextDataObject() + data = wx.TextDataObject() dataStr = "fitting:" + str(self.mods[row].modPosition) data.SetText(dataStr) diff --git a/gui/mainMenuBar.py b/gui/mainMenuBar.py index 128cb23fb..1cd680f63 100644 --- a/gui/mainMenuBar.py +++ b/gui/mainMenuBar.py @@ -107,23 +107,23 @@ class MainMenuBar(wx.MenuBar): charEditItem = wx.MenuItem(windowMenu, self.characterEditorId, "&Character Editor\tCTRL+E") charEditItem.SetBitmap(BitmapLoader.getBitmap("character_small", "gui")) - windowMenu.AppendItem(charEditItem) + windowMenu.Append(charEditItem) damagePatternEditItem = wx.MenuItem(windowMenu, self.damagePatternEditorId, "Damage Pattern Editor\tCTRL+D") damagePatternEditItem.SetBitmap(BitmapLoader.getBitmap("damagePattern_small", "gui")) - windowMenu.AppendItem(damagePatternEditItem) + windowMenu.Append(damagePatternEditItem) targetResistsEditItem = wx.MenuItem(windowMenu, self.targetResistsEditorId, "Target Resists Editor\tCTRL+R") targetResistsEditItem.SetBitmap(BitmapLoader.getBitmap("explosive_small", "gui")) - windowMenu.AppendItem(targetResistsEditItem) + windowMenu.Append(targetResistsEditItem) implantSetEditItem = wx.MenuItem(windowMenu, self.implantSetEditorId, "Implant Set Editor\tCTRL+I") implantSetEditItem.SetBitmap(BitmapLoader.getBitmap("hardwire_small", "gui")) - windowMenu.AppendItem(implantSetEditItem) + windowMenu.Append(implantSetEditItem) graphFrameItem = wx.MenuItem(windowMenu, self.graphFrameId, "Graphs\tCTRL+G") graphFrameItem.SetBitmap(BitmapLoader.getBitmap("graphs_small", "gui")) - windowMenu.AppendItem(graphFrameItem) + windowMenu.Append(graphFrameItem) if not gui.graphFrame.graphFrame_enabled: self.Enable(self.graphFrameId, False) @@ -131,7 +131,7 @@ class MainMenuBar(wx.MenuBar): preferencesShortCut = "CTRL+," if 'wxMac' in wx.PlatformInfo else "CTRL+P" preferencesItem = wx.MenuItem(windowMenu, wx.ID_PREFERENCES, "Preferences\t" + preferencesShortCut) preferencesItem.SetBitmap(BitmapLoader.getBitmap("preferences_small", "gui")) - windowMenu.AppendItem(preferencesItem) + windowMenu.Append(preferencesItem) if 'wxMac' not in wx.PlatformInfo or ('wxMac' in wx.PlatformInfo and wx.VERSION >= (3, 0)): self.sCrest = Crest.getInstance() @@ -154,7 +154,7 @@ class MainMenuBar(wx.MenuBar): windowMenu.AppendSeparator() attrItem = wx.MenuItem(windowMenu, self.attrEditorId, "Attribute Overrides\tCTRL+B") attrItem.SetBitmap(BitmapLoader.getBitmap("fit_rename_small", "gui")) - windowMenu.AppendItem(attrItem) + windowMenu.Append(attrItem) windowMenu.Append(self.toggleOverridesId, "Turn Overrides On") # Help menu diff --git a/gui/utils/draw.py b/gui/utils/draw.py index 70a4dcd5c..7079e4058 100644 --- a/gui/utils/draw.py +++ b/gui/utils/draw.py @@ -84,6 +84,6 @@ def GetPartialText(dc, text , maxWidth, defEllipsis="..."): def CreateDropShadowBitmap(bitmap, opacity): - img = wx.ImageFromBitmap(bitmap) + img = bitmap.ConvertToImage() img = img.AdjustChannels(0, 0, 0, opacity) - return wx.BitmapFromImage(img) + return wx.Bitmap(img) diff --git a/wxthing.py b/wxthing.py index bdcbaf616..7623a2d42 100644 --- a/wxthing.py +++ b/wxthing.py @@ -133,7 +133,7 @@ class MainWindow(wx.Frame): def OnDragInit(self, event): """ Begin a Drag Operation """ # Create a Text Data Object, which holds the text that is to be dragged - tdo = wx.PyTextDataObject(self.text.GetStringSelection()) + tdo = wx.TextDataObject(self.text.GetStringSelection()) # Create a Drop Source Object, which enables the Drag operation tds = wx.DropSource(self.text) # Associate the Data to be dragged with the Drop Source Object