X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6c5ae2d2a6f716e8a89b27579026b9d085f84191..7a0a63aeee7a95b65bf133c8fa7a47538710f12c:/wxPython/demo/wxStaticBitmap.py

diff --git a/wxPython/demo/wxStaticBitmap.py b/wxPython/demo/wxStaticBitmap.py
index 467f56d604..2bfecf0433 100644
--- a/wxPython/demo/wxStaticBitmap.py
+++ b/wxPython/demo/wxStaticBitmap.py
@@ -1,35 +1,30 @@
+# 11/21/2003 - Jeff Grimmett (grimmtooth@softhome.net)
+#
+# o Updated for wx namespace
+# 
 
-from wxPython.wx import *
-from Main import opj
-
-import string
-import images
+import  wx
+import  images
 
 #----------------------------------------------------------------------
 
-class TestPanel(wxPanel):
+class TestPanel(wx.Panel):
     def __init__(self, parent, log):
-        wxPanel.__init__(self, parent, -1)
+        wx.Panel.__init__(self, parent, -1)
         self.log = log
         self.count = 0
 
-        wxStaticText(self, -1, "This is a wxStaticBitmap.", wxPoint(45, 15))
+        wx.StaticText(self, -1, "This is a wxStaticBitmap.", (45, 15))
 
         bmp = images.getTest2Bitmap()
-        mask = wxMaskColour(bmp, wxBLUE)
+        mask = wx.MaskColour(bmp, wx.BLUE)
         bmp.SetMask(mask)
-        wxStaticBitmap(self, -1, bmp, wxPoint(80, 50),
-                       wxSize(bmp.GetWidth(), bmp.GetHeight()))
+        wx.StaticBitmap(self, -1, bmp, (80, 50), (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(opj('bitmaps/robin.jpg'), wxBITMAP_TYPE_JPEG)
-        wxStaticBitmap(self, -1, bmp, (80, 150))
+        bmp = images.getRobinBitmap()
+        wx.StaticBitmap(self, -1, bmp, (80, 150))
 
-        wxStaticText(self, -1, "Hey, if Ousterhout can do it, so can I.",
-                     (200, 175))
+        wx.StaticText(self, -1, "Hey, if Ousterhout can do it, so can I.", (200, 175))
 
 
 #----------------------------------------------------------------------
@@ -40,14 +35,17 @@ def runTest(frame, nb, log):
 
 #----------------------------------------------------------------------
 
+overview = """\
+A static bitmap control displays a bitmap.
 
+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.
 
-
-
-
-
-
-
-overview = """\
 """
+
+if __name__ == '__main__':
+    import sys,os
+    import run
+    run.main(['', os.path.basename(sys.argv[0])])