sylv/scyther
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix deprecated class usage and function calls.

Browse Source
This commit is contained in:
Thomas Fleming
2018-11-09 22:17:39 +00:00
committed by Cas Cremers
parent 92aa826bf3
commit 44e5e340be
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gui/Gui/Attackwindow.py
View File

@@ -54,7 +54,7 @@ class AttackDisplay(wx.ScrolledWindow):
wx.ScrolledWindow.__init__(self,parent,id=-1)
self.Bind(wx.EVT_SIZE, self.OnSize)
self.Image = wx.StaticBitmap(self, -1, wx.EmptyBitmap(1,1))
self.Image = wx.StaticBitmap(self, -1, wx.Bitmap(1,1))
self.box = wx.BoxSizer(wx.VERTICAL)
self.box.Add(self.Image,1,wx.ALIGN_CENTER)
self.hbox = wx.BoxSizer(wx.HORIZONTAL)
@@ -93,9 +93,7 @@ class AttackDisplay(wx.ScrolledWindow):
# This is needed, don't ask me why.
self.SetScrollbars(0,0,0,0,0,0)
size = self.GetClientSize()
framewidth = size.width
frameheight = size.height
(framewidth,frameheight) = self.GetClientSize()
(virtualwidth,virtualheight) = (framewidth,frameheight)
def makefit(width,height):
@@ -120,14 +118,14 @@ class AttackDisplay(wx.ScrolledWindow):
if self.attack.filetype == "png":
bmp = self.original
if not bmp.Ok():
if not bmp.IsOk():
bmp = wx.EmptyImage(1,1)
else:
(originalwidth,originalheight) = (bmp.GetWidth(), bmp.GetHeight())
if self.win.fit:
(factor, virtualwidth, virtualheight) = makefit(originalwidth,originalheight)
bmp = self.original.Scale(virtualwidth,virtualheight)
self.Image.SetBitmap(wx.BitmapFromImage(bmp))
self.Image.SetBitmap(wx.Bitmap(bmp))
elif self.attack.filetype == "ps":
pil = self.original.copy()