just tidied up the comment

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

diff --git a/wxPython/demo/wxMask.py b/wxPython/demo/wxMask.py
index c1fec35388ed0d80bcd7562f610d2a70e8d0967b..68b8468a867bf75560982f9b3e62ce986a6e1ca1 100644 (file)
--- a/wxPython/demo/wxMask.py
+++ b/wxPython/demo/wxMask.py
@@ -40,8 +40,7 @@ class TestMaskWindow(wxScrolledWindow):
         self.bmp_withmask  = images.getTestStar2Bitmap()
 
         # this mask comes from a monochrome bitmap
         self.bmp_withmask  = images.getTestStar2Bitmap()
 
         # this mask comes from a monochrome bitmap

-        self.bmp_themask = images.getTestMaskBitmap()
-        self.bmp_themask.SetDepth(1)
+        self.bmp_themask = wxBitmapFromImage(images.getTestMaskImage(), 1)

         mask = wxMask(self.bmp_themask)
 
         # set the mask on our bitmap
         mask = wxMask(self.bmp_themask)
 
         # set the mask on our bitmap


@@ -87,16 +86,26 @@ class TestMaskWindow(wxScrolledWindow):
             x,y = 120+150*(i%4), 20+100*(i/4)
             dc.DrawText(text, x, y-20)
             mdc.SelectObject(self.bmp_withcolourmask)
             x,y = 120+150*(i%4), 20+100*(i/4)
             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
 
 
             i = i + 1
 
 

+# On wxGTK there needs to be a panel under wxScrolledWindows if they are
+# going to be in a wxNotebook...
+class TestPanel(wxPanel):
+    def __init__(self, parent, ID):
+        wxPanel.__init__(self, parent, ID)
+        self.win = TestMaskWindow(self)
+        EVT_SIZE(self, self.OnSize)
+
+    def OnSize(self, evt):
+        self.win.SetSize(evt.GetSize())

 
 
 #----------------------------------------------------------------------
 
 def runTest(frame, nb, log):
 
 
 #----------------------------------------------------------------------
 
 def runTest(frame, nb, log):

-    win = TestMaskWindow(nb)
+    win = TestPanel(nb, -1)

     return win
 
 #----------------------------------------------------------------------
     return win
 
 #----------------------------------------------------------------------


@@ -105,3 +114,11 @@ def runTest(frame, nb, log):
 
 overview = """\
 """
 
 overview = """\
 """

+
+
+
+if __name__ == '__main__':
+    import sys,os
+    import run
+    run.main(['', os.path.basename(sys.argv[0])])
+