MultiByteToWideChar(CP_UTF7, MB_ERR_INVALID_CHARS, ...) fails, so don't use MB_ERR_IN...

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

diff --git a/wxPython/demo/DragImage.py b/wxPython/demo/DragImage.py
index ad8f880a5d4fb3ceeefeb1b0973a3953f9a882b7..1bf2a3c2a4c278cb4cecdb5c5a55623447853115 100644 (file)
--- a/wxPython/demo/DragImage.py
+++ b/wxPython/demo/DragImage.py
@@ -1,7 +1,3 @@
-# 11/15/2003 - Jeff Grimmett (grimmtooth@softhome.net)
-#
-# o Updated for wx namespace
-# 

 
 import  wx
 import  images
 
 import  wx
 import  images


@@ -29,9 +25,9 @@ class DragShape:
             memDC = wx.MemoryDC()
             memDC.SelectObject(self.bmp)
 
             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:
 
             return True
         else:


@@ -55,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()
         # 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
         shape = DragShape(bmp)
         shape.pos = (5, 5)
         shape.fullscreen = True


@@ -76,9 +73,9 @@ class DragCanvas(wx.ScrolledWindow):
         dc.Clear()
         dc.SetTextForeground(wx.RED)
         dc.SetFont(font)
         dc.Clear()
         dc.SetTextForeground(wx.RED)
         dc.SetFont(font)

-        dc.DrawText(text, (0, 0))
+        dc.DrawText(text, 0, 0)

         dc.SelectObject(wx.NullBitmap)
         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)
         bmp.SetMask(mask)
         shape = DragShape(bmp)
         shape.pos = (5, 100)


@@ -125,7 +122,7 @@ class DragCanvas(wx.ScrolledWindow):
             y = 0
 
             while y < sz.height:
             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
                 y = y + h
 
             x = x + w


@@ -341,5 +338,5 @@ full-screen dragging.
 if __name__ == '__main__':
     import sys,os
     import run
 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:])