Compilation fix for wxCStrData handling.

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

diff --git a/wxPython/demo/DragImage.py b/wxPython/demo/DragImage.py
index cb9156bd4745d77cb4be62fbc1613622a6118ff4..d8f7ef3458affcc013edb91217b840ef57aa4df8 100644 (file)
--- a/wxPython/demo/DragImage.py
+++ b/wxPython/demo/DragImage.py
@@ -58,6 +58,11 @@ class DragCanvas(wx.ScrolledWindow):
         shape.fullscreen = True
         self.shapes.append(shape)
 
         shape.fullscreen = True
         self.shapes.append(shape)
 

+        bmp = images.getTheKidBitmap()
+        shape = DragShape(bmp)
+        shape.pos = (200, 5)
+        self.shapes.append(shape)
+

         # Make a shape from some text
         text = "Some Text"
         bg_colour = wx.Colour(57, 115, 57)  # matches the bg image
         # Make a shape from some text
         text = "Some Text"
         bg_colour = wx.Colour(57, 115, 57)  # matches the bg image


@@ -84,11 +89,6 @@ class DragCanvas(wx.ScrolledWindow):
         self.shapes.append(shape)
 
 
         self.shapes.append(shape)
 
 

-        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)
         self.Bind(wx.EVT_LEFT_DOWN, self.OnLeftDown)
         self.Bind(wx.EVT_ERASE_BACKGROUND, self.OnEraseBackground)
         self.Bind(wx.EVT_PAINT, self.OnPaint)
         self.Bind(wx.EVT_LEFT_DOWN, self.OnLeftDown)


@@ -150,7 +150,7 @@ class DragCanvas(wx.ScrolledWindow):
         dc = evt.GetDC()
 
         if not dc:
         dc = evt.GetDC()
 
         if not dc:

-            dc = wxClientDC(self)
+            dc = wx.ClientDC(self)

             rect = self.GetUpdateRegion().GetBox()
             dc.SetClippingRect(rect)
         self.TileBackground(dc)
             rect = self.GetUpdateRegion().GetBox()
             dc.SetClippingRect(rect)
         self.TileBackground(dc)


@@ -185,10 +185,8 @@ class DragCanvas(wx.ScrolledWindow):
         self.dragImage.EndDrag()
         self.dragImage = None
 
         self.dragImage.EndDrag()
         self.dragImage = None
 

-        dc = wx.ClientDC(self)
-

         if self.hiliteShape:
         if self.hiliteShape:

-            self.hiliteShape.Draw(dc)
+            self.RefreshRect(self.hiliteShape.GetRect())

             self.hiliteShape = None
 
         # reposition and draw the shape
             self.hiliteShape = None
 
         # reposition and draw the shape


@@ -212,9 +210,10 @@ class DragCanvas(wx.ScrolledWindow):
             )
             
         self.dragShape.shown = True
             )
             
         self.dragShape.shown = True

-        self.dragShape.Draw(dc)
+        self.RefreshRect(self.dragShape.GetRect())

         self.dragShape = None
 
         self.dragShape = None
 

+

     # The mouse is moving
     def OnMotion(self, evt):
         # Ignore mouse movement if we're not dragging.
     # The mouse is moving
     def OnMotion(self, evt):
         # Ignore mouse movement if we're not dragging.