use AM_ICONV for iconv configure checks

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

diff --git a/wxPython/demo/wxStaticBitmap.py b/wxPython/demo/wxStaticBitmap.py
index cb9c8df10b3c80e7b4c88cecf6244d6ee54a6d2e..edaf6c8fb9b012603be09c642909e4a6da4b38bb 100644 (file)
--- a/wxPython/demo/wxStaticBitmap.py
+++ b/wxPython/demo/wxStaticBitmap.py
@@ -2,6 +2,7 @@
 from wxPython.wx import *
 
 import string
+import images
 
 #----------------------------------------------------------------------
 
@@ -13,11 +14,21 @@ class TestPanel(wxPanel):
 
         wxStaticText(self, -1, "This is a wxStaticBitmap.", wxPoint(45, 15))
 
-        bmp = wxBitmap('bitmaps/test2.bmp', wxBITMAP_TYPE_BMP)
+        bmp = images.getTest2Bitmap()
+        mask = wxMaskColour(bmp, wxBLUE)
+        bmp.SetMask(mask)
         wxStaticBitmap(self, -1, bmp, wxPoint(80, 50),
                        wxSize(bmp.GetWidth(), bmp.GetHeight()))
 
+        # This one doesn't convert to the embedded format very well,
+        # (lots of colors so it explodes in size and takes a noticable
+        # amount of time to convert back to a bitmap.)  So we'll just
+        # do it the old way
+        bmp = wxBitmap('bitmaps/robin.jpg', wxBITMAP_TYPE_JPEG)
+        wxStaticBitmap(self, -1, bmp, (80, 150))
 
+        wxStaticText(self, -1, "Hey, if Ousterhout can do it, so can I.",
+                     (200, 175))
 
 
 #----------------------------------------------------------------------