X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/95bfd958bda8955ac81277c78e5627c926154f39..628eae0bcd7916c57847b7eab739d4cc32534ccf:/wxPython/demo/DragImage.py diff --git a/wxPython/demo/DragImage.py b/wxPython/demo/DragImage.py index 05f7853a99..c03fd9292c 100644 --- a/wxPython/demo/DragImage.py +++ b/wxPython/demo/DragImage.py @@ -25,9 +25,9 @@ class DragShape: memDC = wx.MemoryDC() memDC.SelectObject(self.bmp) - dc.Blit((self.pos[0], self.pos[1]), - (self.bmp.GetWidth(), self.bmp.GetHeight()), - memDC, (0, 0), op, True) + dc.Blit(self.pos[0], self.pos[1], + self.bmp.GetWidth(), self.bmp.GetHeight(), + memDC, 0, 0, op, True) return True else: @@ -51,6 +51,7 @@ class DragCanvas(wx.ScrolledWindow): # Make a shape from an image and mask. This one will demo # dragging outside the window bmp = images.getTestStarBitmap() + #bmp = wx.Bitmap('bitmaps/toucan.png') shape = DragShape(bmp) shape.pos = (5, 5) shape.fullscreen = True @@ -72,9 +73,9 @@ class DragCanvas(wx.ScrolledWindow): dc.Clear() dc.SetTextForeground(wx.RED) dc.SetFont(font) - dc.DrawText(text, (0, 0)) + dc.DrawText(text, 0, 0) dc.SelectObject(wx.NullBitmap) - mask = wx.MaskColour(bmp, bg_colour) + mask = wx.Mask(bmp, bg_colour) bmp.SetMask(mask) shape = DragShape(bmp) shape.pos = (5, 100) @@ -82,17 +83,10 @@ class DragCanvas(wx.ScrolledWindow): self.shapes.append(shape) - # Make some shapes from some playing card images. - x = 200 - - for card in ['_01c_', '_12h_', '_13d_', '_10s_']: - bmpFunc = getattr(images, "get%sBitmap" % card) - bmp = bmpFunc() - shape = DragShape(bmp) - shape.pos = (x, 5) - self.shapes.append(shape) - x = x + 80 - + bmp = images.getTheKidBitmap() + shape = DragShape(bmp) + shape.pos = (200, 5) + self.shapes.append(shape) self.Bind(wx.EVT_ERASE_BACKGROUND, self.OnEraseBackground) self.Bind(wx.EVT_PAINT, self.OnPaint) @@ -121,7 +115,7 @@ class DragCanvas(wx.ScrolledWindow): y = 0 while y < sz.height: - dc.DrawBitmap(self.bg_bmp, (x, y)) + dc.DrawBitmap(self.bg_bmp, x, y) y = y + h x = x + w @@ -337,5 +331,5 @@ full-screen dragging. if __name__ == '__main__': import sys,os import run - run.main(['', os.path.basename(sys.argv[0])]) + run.main(['', os.path.basename(sys.argv[0])] + sys.argv[1:])