Fix deprecated class usage and function calls.
This commit is contained in:
parent
92aa826bf3
commit
44e5e340be
@ -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()
|
||||
|
@ -470,7 +470,7 @@ class ScytherRun(object):
|
||||
Error.ShowAndExit(text)
|
||||
|
||||
# start the thread
|
||||
self.verifywin.SetCursor(wx.StockCursor(wx.CURSOR_WAIT))
|
||||
self.verifywin.SetCursor(wx.Cursor(wx.CURSOR_WAIT))
|
||||
self.verifywin.Bind(wx.EVT_CLOSE, self.closer)
|
||||
self.verifywin.Bind(wx.EVT_WINDOW_DESTROY, self.closer)
|
||||
self.verifywin.Bind(wx.EVT_BUTTON, self.closer, id=wx.ID_CANCEL)
|
||||
@ -520,12 +520,12 @@ class ScytherRun(object):
|
||||
|
||||
def allDone():
|
||||
if resultwin:
|
||||
resultwin.SetCursor(wx.StockCursor(wx.CURSOR_ARROW))
|
||||
resultwin.SetCursor(wx.Cursor(wx.CURSOR_ARROW))
|
||||
resultwin.SetStatusText("Done.")
|
||||
|
||||
resultwin.Center()
|
||||
resultwin.Show(True)
|
||||
resultwin.SetCursor(wx.StockCursor(wx.CURSOR_ARROWWAIT))
|
||||
resultwin.SetCursor(wx.Cursor(wx.CURSOR_ARROWWAIT))
|
||||
|
||||
wx.Yield()
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user