bitmap mask tests

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4863 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/utils/wxPython/demo/wxButton.py b/utils/wxPython/demo/wxButton.py
index 2ea79bdca72c8bef70b3547863a5b2d10bd87d20..2ec66651a661b8d050f6fd3a24db65b93ff97291 100644 (file)
--- a/utils/wxPython/demo/wxButton.py
+++ b/utils/wxPython/demo/wxButton.py
@@ -8,13 +8,18 @@ class TestPanel(wxPanel):
         wxPanel.__init__(self, parent, -1)
         self.log = log
 
-        wxButton(self, 10, "Hello", wxPoint(20, 20)).SetDefault()
+        b = wxButton(self, 10, "Hello", wxPoint(20, 20))
         EVT_BUTTON(self, 10, self.OnClick)
+        b.SetDefault()
+        b.SetBackgroundColour(wxBLUE)
+        b.SetForegroundColour(wxWHITE)
 
         wxButton(self, 20, "HELLO AGAIN!", wxPoint(20, 60), wxSize(90, 45))
         EVT_BUTTON(self, 20, self.OnClick)
 
         bmp = wxBitmap('bitmaps/test2.bmp', wxBITMAP_TYPE_BMP)
+        mask = wxMaskColour(bmp, wxBLUE)
+        bmp.SetMask(mask)
         wxBitmapButton(self, 30, bmp, wxPoint(140, 20),
                        wxSize(bmp.GetWidth()+10, bmp.GetHeight()+10))
         EVT_BUTTON(self, 30, self.OnClick)

diff --git a/utils/wxPython/demo/wxScrolledWindow.py b/utils/wxPython/demo/wxScrolledWindow.py
index 936e48ef436a361edfdd427549d97128110aa3ba..9cd5bea955b078913240d8a81f22222cf3f5aa06 100644 (file)
--- a/utils/wxPython/demo/wxScrolledWindow.py
+++ b/utils/wxPython/demo/wxScrolledWindow.py
@@ -18,6 +18,8 @@ class MyCanvas(wxScrolledWindow):
 
         self.SetCursor(wxStockCursor(wxCURSOR_PENCIL))
         bmp = wxBitmap('bitmaps/test2.bmp', wxBITMAP_TYPE_BMP)
+        mask = wxMaskColour(bmp, wxBLUE)
+        bmp.SetMask(mask)
         self.bmp = bmp
 
         self.SetScrollbars(20, 20, self.maxWidth/20, self.maxHeight/20)
@@ -61,7 +63,7 @@ class MyCanvas(wxScrolledWindow):
         dc.SetPen(wxGREEN_PEN)
         dc.DrawSpline(lst+[(100,100)])
 
-        dc.DrawBitmap(self.bmp, 200, 20)
+        dc.DrawBitmap(self.bmp, 200, 20, true)
         dc.SetTextForeground(wxColour(0, 0xFF, 0x80))
         dc.DrawText("a bitmap", 200, 85)