Associate/Disassociate now check for non-NULL pointer instead of requiring

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

diff --git a/wxPython/demo/wxStaticBitmap.py b/wxPython/demo/wxStaticBitmap.py
index 5075e946c4e3bdd581bfdd75359b4d69ac84c16e..7dfc51722b2d85dbe45c1ccdc7187091795aa3e0 100644 (file)
--- a/wxPython/demo/wxStaticBitmap.py
+++ b/wxPython/demo/wxStaticBitmap.py
@@ -1,7 +1,7 @@
 
 from wxPython.wx import *
 
 
 from wxPython.wx import *
 

-import string
+import images

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


@@ -13,13 +13,13 @@ class TestPanel(wxPanel):
 
         wxStaticText(self, -1, "This is a wxStaticBitmap.", wxPoint(45, 15))
 
 
         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()))
 
         mask = wxMaskColour(bmp, wxBLUE)
         bmp.SetMask(mask)
         wxStaticBitmap(self, -1, bmp, wxPoint(80, 50),
                        wxSize(bmp.GetWidth(), bmp.GetHeight()))
 

-        bmp = wxBitmap('bitmaps/robin.jpg', wxBITMAP_TYPE_JPEG)
+        bmp = images.getRobinBitmap()

         wxStaticBitmap(self, -1, bmp, (80, 150))
 
         wxStaticText(self, -1, "Hey, if Ousterhout can do it, so can I.",
         wxStaticBitmap(self, -1, bmp, (80, 150))
 
         wxStaticText(self, -1, "Hey, if Ousterhout can do it, so can I.",


@@ -38,10 +38,12 @@ def runTest(frame, nb, log):
 
 
 
 
 
 

+overview = """\
+"""

 
 
 
 
 
 

-
-
-overview = """\
-"""
+if __name__ == '__main__':
+    import sys,os
+    import run
+    run.main(['', os.path.basename(sys.argv[0])])