Added demo for Stock Buttons

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

diff --git a/wxPython/demo/ColourDB.py b/wxPython/demo/ColourDB.py
index e00652c734d3cf25cda6f7b9b32893f1383a1475..3c6c82352060c7db692baba745c2e9f27e7b8ade 100644 (file)
--- a/wxPython/demo/ColourDB.py
+++ b/wxPython/demo/ColourDB.py
@@ -73,7 +73,7 @@ class TestWindow(wx.ScrolledWindow):
         while x < sz.width:
             y = -dy
             while y < sz.height:
         while x < sz.width:
             y = -dy
             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


@@ -121,13 +121,12 @@ class TestWindow(wx.ScrolledWindow):
             clr = colours[line]
             y = (line+1) * self.lineHeight + 2
 
             clr = colours[line]
             y = (line+1) * self.lineHeight + 2
 

-            # Updated for 2.5 - now takes tuple for pos
-            dc.DrawText(clr, (self.cellWidth, y))
+            dc.DrawText(clr, self.cellWidth, y)

 
             brush = wx.Brush(clr, wx.SOLID)
             dc.SetBrush(brush)
 
             brush = wx.Brush(clr, wx.SOLID)
             dc.SetBrush(brush)

-            dc.DrawRectangle((12 * self.cellWidth, y),
-                             (6 * self.cellWidth, self.textHeight))
+            dc.DrawRectangle(12 * self.cellWidth, y,
+                             6 * self.cellWidth, self.textHeight)

 
         dc.EndDrawing()
 
 
         dc.EndDrawing()