For whatever reason, font-size 9 is now hardly readable on Mac. Using default font...

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

diff --git a/wxPython/demo/Mask.py b/wxPython/demo/Mask.py
index 0af29a37612b714c3cfec89742d524de42b91742..faf15cd559b965eabf36b81d9834387d6591f94b 100644 (file)
--- a/wxPython/demo/Mask.py
+++ b/wxPython/demo/Mask.py
@@ -40,7 +40,7 @@ class TestMaskWindow(wx.ScrolledWindow):
         self.bmp_withmask  = images.getTestStar2Bitmap()
 
         # this mask comes from a monochrome bitmap
-        self.bmp_themask = wx.BitmapFromImage(images.getTestMaskImage(), 1)
+        self.bmp_themask = images.getTestMaskBitmap()
         mask = wx.Mask(self.bmp_themask)
 
         # set the mask on our bitmap
@@ -49,7 +49,7 @@ class TestMaskWindow(wx.ScrolledWindow):
         # Now we'll create a mask in a bit of an easier way, by picking a
         # colour in the image that is to be the transparent colour.
         self.bmp_withcolourmask  = images.getTestStar2Bitmap()
-        mask = wx.MaskColour(self.bmp_withcolourmask, wx.WHITE)
+        mask = wx.Mask(self.bmp_withcolourmask, wx.WHITE)
         self.bmp_withcolourmask.SetMask(mask)
 
         self.SetScrollbars(20, 20, 700/20, 460/20)
@@ -58,6 +58,7 @@ class TestMaskWindow(wx.ScrolledWindow):
 
 
     def OnPaint (self, e):
+        self.SetBackgroundColour(wx.Colour(0,128,0))
         dc = wx.PaintDC(self)
         self.PrepareDC(dc)
         dc.SetTextForeground(wx.WHITE)
@@ -65,17 +66,17 @@ class TestMaskWindow(wx.ScrolledWindow):
         # make an interesting background...
         dc.SetPen(wx.MEDIUM_GREY_PEN)
         for i in range(100):
-            dc.DrawLine((0,i*10), (i*10,0))
+            dc.DrawLine(0,i*10, i*10,0)
 
         # draw raw image, mask, and masked images
-        dc.DrawText('original image', (0,0))
-        dc.DrawBitmap(self.bmp_nomask, (0,20), 0)
-        dc.DrawText('with colour mask', (0,100))
-        dc.DrawBitmap(self.bmp_withcolourmask, (0,120), 1)
-        dc.DrawText('the mask image', (0,200))
-        dc.DrawBitmap(self.bmp_themask, (0,220), 0)
-        dc.DrawText('masked image', (0,300))
-        dc.DrawBitmap(self.bmp_withmask, (0,320), 1)
+        dc.DrawText('original image', 0,0)
+        dc.DrawBitmap(self.bmp_nomask, 0,20, 0)
+        dc.DrawText('with colour mask', 0,100)
+        dc.DrawBitmap(self.bmp_withcolourmask, 0,120, 1)
+        dc.DrawText('the mask image', 0,200)
+        dc.DrawBitmap(self.bmp_themask, 0,220, 0)
+        dc.DrawText('masked image', 0,300)
+        dc.DrawBitmap(self.bmp_withmask, 0,320, 1)
 
         cx,cy = self.bmp_themask.GetWidth(), self.bmp_themask.GetHeight()
 
@@ -85,9 +86,9 @@ class TestMaskWindow(wx.ScrolledWindow):
 
         for text, code in logicList:
             x,y = 120+150*(i%4), 20+100*(i/4)
-            dc.DrawText(text, (x, y-20))
+            dc.DrawText(text, x, y-20)
             mdc.SelectObject(self.bmp_withcolourmask)
-            dc.Blit((x,y), (cx,cy), mdc, (0,0), code, True)
+            dc.Blit(x,y, cx,cy, mdc, 0,0, code, True)
             i = i + 1
 
 
@@ -127,5 +128,5 @@ Context (dc) <code>Blit()</code> method's logic codes.
 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:])