corrected Unicode conversion when replacing shared library extension with ".rsrc"

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

diff --git a/wxPython/demo/wxDragImage.py b/wxPython/demo/wxDragImage.py
index 74ade7e0eaad69eca0d5a3431d5f4afaa2c2837f..4c348637cf03558f062e703dcd43537451e9a589 100644 (file)
--- a/wxPython/demo/wxDragImage.py
+++ b/wxPython/demo/wxDragImage.py
@@ -29,9 +29,9 @@ class DragShape:
             memDC = wxMemoryDC()
             memDC.SelectObject(self.bmp)
 
-            dc.Blit(self.pos.x, self.pos.y,
-                    self.bmp.GetWidth(), self.bmp.GetHeight(),
-                    memDC, 0, 0, op, True)
+            dc.Blit((self.pos.x, self.pos.y),
+                    (self.bmp.GetWidth(), self.bmp.GetHeight()),
+                    memDC, (0, 0), op, True)
 
             return True
         else:
@@ -74,7 +74,7 @@ class DragCanvas(wxScrolledWindow):
         dc.Clear()
         dc.SetTextForeground(wxRED)
         dc.SetFont(font)
-        dc.DrawText(text, 0, 0)
+        dc.DrawText(text, (0, 0))
         dc.SelectObject(wxNullBitmap)
         mask = wxMaskColour(bmp, bg_colour)
         bmp.SetMask(mask)
@@ -117,7 +117,7 @@ class DragCanvas(wxScrolledWindow):
         while x < sz.width:
             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
 
@@ -137,7 +137,7 @@ class DragCanvas(wxScrolledWindow):
 
     def EraseShape(self, shape, dc):
         r = shape.GetRect()
-        dc.SetClippingRegion(r.x, r.y, r.width, r.height)
+        dc.SetClippingRect(r)
         self.TileBackground(dc)
         self.DrawShapes(dc)
         dc.DestroyClippingRegion()
@@ -148,7 +148,7 @@ class DragCanvas(wxScrolledWindow):
         if not dc:
             dc = wxClientDC(self)
             rect = self.GetUpdateRegion().GetBox()
-            dc.SetClippingRegion(rect.x, rect.y, rect.width, rect.height)
+            dc.SetClippingRect(rect)
         self.TileBackground(dc)