update from herbert breunung

[wxWidgets.git] / wxPython / demo / ImageAlpha.py
diff --git a/wxPython/demo/ImageAlpha.py b/wxPython/demo/ImageAlpha.py

index cec268ce6eaf19e7057226a92441e5361b8a0d22..cb5210412f2da73c0d1e2a19759fa26946aac6d1 100644 (file)
--- a/wxPython/demo/ImageAlpha.py
+++ b/wxPython/demo/ImageAlpha.py
@@ -21,18 +21,22 @@ class TestPanel(wx.Panel):
          dc.Clear()
  
          dc.SetFont(wx.Font(16, wx.SWISS, wx.NORMAL, wx.BOLD, True))
-        dc.DrawText("Bitmap alpha blending (on wxMSW and wxGTK)",
-                    (25,25))
-
+        dc.DrawText("Bitmap alpha blending (on wxMSW and wxMac only)",
+                    25,25)
+        
          bmp = wx.Bitmap(opj('bitmaps/toucan.png'))
-        dc.DrawBitmap(bmp, (25,100), True)
+        if "__WXGTK__" in wx.PlatformInfo:
+            # try to make up for it a bit...
+            bmp.SetMaskColour("black")
+            
+        dc.DrawBitmap(bmp, 25,100, True)
  
          dc.SetFont(self.GetFont())
          y = 75
          for line in range(10):
              y += dc.GetCharHeight() + 5
-            dc.DrawText(msg, (200, y))
-        dc.DrawBitmap(bmp, (250,100), True)
+            dc.DrawText(msg, 200, y)
+        dc.DrawBitmap(bmp, 250,100, True)
          
  
  
@@ -49,11 +53,14 @@ def runTest(frame, nb, log):
  overview = """<html><body>
  <h2><center>Images with Alpha</center></h2>
  
-wxMSW and wxGTK now support alpha channels of supported image
-types, and will properly blend that chennel when drawing a
+wxMSW and wxMac now support alpha channels of supported image
+types, and will properly blend that channel when drawing a
  bitmap.  It is not supported yet on wxGTK, (if you would like to
  change that please submit a patch!)
  
+<p>On wxGTK this demo turns the alpha channel into a 1-bit mask, so
+yes, it looks like crap.  Please help us fix it!
+
  </body></html>
  """