Another package name fix

[wxWidgets.git] / wxPython / demo / DragImage.py

diff --git a/wxPython/demo/DragImage.py b/wxPython/demo/DragImage.py
index 05f7853a998b6a4415f0754008ef7e78009088c3..2592c977286a77d481e60f69b61fc401195f906e 100644 (file)
--- 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:
@@ -47,10 +47,12 @@ class DragCanvas(wx.ScrolledWindow):
 
         self.SetCursor(wx.StockCursor(wx.CURSOR_ARROW))
         self.bg_bmp = images.getBackgroundBitmap()
+        self.SetBackgroundStyle(wx.BG_STYLE_CUSTOM)
 
         # 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 +74,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 +84,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 +116,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
@@ -155,7 +150,7 @@ class DragCanvas(wx.ScrolledWindow):
         dc = evt.GetDC()
 
         if not dc:
-            dc = wxClientDC(self)
+            dc = wx.ClientDC(self)
             rect = self.GetUpdateRegion().GetBox()
             dc.SetClippingRect(rect)
         self.TileBackground(dc)
@@ -190,10 +185,8 @@ class DragCanvas(wx.ScrolledWindow):
         self.dragImage.EndDrag()
         self.dragImage = None
 
-        dc = wx.ClientDC(self)
-
         if self.hiliteShape:
-            self.hiliteShape.Draw(dc)
+            self.RefreshRect(self.hiliteShape.GetRect())
             self.hiliteShape = None
 
         # reposition and draw the shape
@@ -217,9 +210,10 @@ class DragCanvas(wx.ScrolledWindow):
             )
             
         self.dragShape.shown = True
-        self.dragShape.Draw(dc)
+        self.RefreshRect(self.dragShape.GetRect())
         self.dragShape = None
 
+
     # The mouse is moving
     def OnMotion(self, evt):
         # Ignore mouse movement if we're not dragging.
@@ -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:])