warning fix

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

diff --git a/wxPython/demo/StaticBitmap.py b/wxPython/demo/StaticBitmap.py
index 2bfecf04331be7370970e101c4ed129c88d1dfd9..1b9f3c2b03e1f5b6cce173780e7a536b5601c882 100644 (file)
--- a/wxPython/demo/StaticBitmap.py
+++ b/wxPython/demo/StaticBitmap.py
@@ -1,30 +1,37 @@
-# 11/21/2003 - Jeff Grimmett (grimmtooth@softhome.net)
-#
-# o Updated for wx namespace
-# 

 
 import  wx
 import  images
 
 
 import  wx
 import  images
 

+
+USE_GENERIC = 0
+
+if USE_GENERIC:
+    from wx.lib.stattext import GenStaticText as StaticText
+    from wx.lib.statbmp  import GenStaticBitmap as StaticBitmap
+else:
+    StaticText = wx.StaticText
+    StaticBitmap = wx.StaticBitmap
+
+

 #----------------------------------------------------------------------
 
 class TestPanel(wx.Panel):
     def __init__(self, parent, log):
         wx.Panel.__init__(self, parent, -1)
         self.log = log
 #----------------------------------------------------------------------
 
 class TestPanel(wx.Panel):
     def __init__(self, parent, log):
         wx.Panel.__init__(self, parent, -1)
         self.log = log

-        self.count = 0
+        ##self.SetBackgroundColour("sky blue")

 
 

-        wx.StaticText(self, -1, "This is a wxStaticBitmap.", (45, 15))
+        StaticText(self, -1, "This is a wx.StaticBitmap.", (45, 15))

 
         bmp = images.getTest2Bitmap()
 
         bmp = images.getTest2Bitmap()

-        mask = wx.MaskColour(bmp, wx.BLUE)
+        mask = wx.Mask(bmp, wx.BLUE)

         bmp.SetMask(mask)
         bmp.SetMask(mask)

-        wx.StaticBitmap(self, -1, bmp, (80, 50), (bmp.GetWidth(), bmp.GetHeight()))
+        StaticBitmap(self, -1, bmp, (80, 50), (bmp.GetWidth(), bmp.GetHeight()))

 
         bmp = images.getRobinBitmap()
 
         bmp = images.getRobinBitmap()

-        wx.StaticBitmap(self, -1, bmp, (80, 150))
+        StaticBitmap(self, -1, bmp, (80, 150))

 
 

-        wx.StaticText(self, -1, "Hey, if Ousterhout can do it, so can I.", (200, 175))
+        StaticText(self, -1, "Hey, if Ousterhout can do it, so can I.", (200, 175))

 
 
 #----------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------


@@ -36,16 +43,16 @@ def runTest(frame, nb, log):
 #----------------------------------------------------------------------
 
 overview = """\
 #----------------------------------------------------------------------
 
 overview = """\

-A static bitmap control displays a bitmap.
+A StaticBitmap control displays a bitmap.

 
 The bitmap to be displayed should have a small number of colours, such as 16, 
 to avoid palette problems.
 
 
 The bitmap to be displayed should have a small number of colours, such as 16, 
 to avoid palette problems.
 

-A bitmap can be derived from most image formats using the wxImage class.
+A bitmap can be derived from most image formats using the wx.Image class.

 
 """
 
 if __name__ == '__main__':
     import sys,os
     import run
 
 """
 
 if __name__ == '__main__':
     import sys,os
     import run

-    run.main(['', os.path.basename(sys.argv[0])])
+    run.main(['', os.path.basename(sys.argv[0])] + sys.argv[1:])