more MSLU fixes and moved MSLU stuff into separate file

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

diff --git a/wxPython/demo/wxMask.py b/wxPython/demo/wxMask.py
index 7f93f019012d577ba03f545618a61558a65fa983..7c1f7ccfc612df0e3a3412a60e564640bfb0cef8 100644 (file)
--- a/wxPython/demo/wxMask.py
+++ b/wxPython/demo/wxMask.py
@@ -26,19 +26,21 @@ logicList = [
     ('wxXOR', wxXOR),
 ]
 
+import images
+
 class TestMaskWindow(wxScrolledWindow):
     def __init__(self, parent):
         wxScrolledWindow.__init__(self, parent, -1)
         self.SetBackgroundColour(wxColour(0,128,0))
 
         # A reference bitmap that we won't mask
-        self.bmp_nomask  = wxBitmap('bitmaps/test_image.png', wxBITMAP_TYPE_PNG)
+        self.bmp_nomask  = images.getTestStar2Bitmap()
 
         # One that we will
-        self.bmp_withmask  = wxBitmap('bitmaps/test_image.png', wxBITMAP_TYPE_PNG)
+        self.bmp_withmask  = images.getTestStar2Bitmap()
 
         # this mask comes from a monochrome bitmap
-        self.bmp_themask = wxBitmap('bitmaps/test_mask.bmp',  wxBITMAP_TYPE_BMP)
+        self.bmp_themask = images.getTestMaskBitmap()
         self.bmp_themask.SetDepth(1)
         mask = wxMask(self.bmp_themask)
 
@@ -47,7 +49,7 @@ class TestMaskWindow(wxScrolledWindow):
 
         # 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  = wxBitmap('bitmaps/test_image.png', wxBITMAP_TYPE_PNG)
+        self.bmp_withcolourmask  = images.getTestStar2Bitmap()
         mask = wxMaskColour(self.bmp_withcolourmask, wxWHITE)
         self.bmp_withcolourmask.SetMask(mask)
 
@@ -89,12 +91,22 @@ class TestMaskWindow(wxScrolledWindow):
             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):
-    win = TestMaskWindow(nb)
+    win = TestPanel(nb, -1)
     return win
 
 #----------------------------------------------------------------------