Reverted to old method names/signatures for wx.DC, updated lib and

demo to match.  Also fixed some deprecation warnings.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27049 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-05-02 02:41:33 +00:00
parent 019fd9d379
commit d7403ad2d1
61 changed files with 536 additions and 702 deletions

View File

@@ -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:
@@ -73,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)
@@ -122,7 +122,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