applied patch for calculating the tree items size with non default font (patch 520965)

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

diff --git a/wxPython/demo/wxStaticBitmap.py b/wxPython/demo/wxStaticBitmap.py
index e90aad9c703d9139b456c39fc8ff97ed4f7223fe..467f56d604766833618363930bc2377b13e47a6b 100644 (file)
--- a/wxPython/demo/wxStaticBitmap.py
+++ b/wxPython/demo/wxStaticBitmap.py
@@ -1,5 +1,6 @@
 
 from wxPython.wx import *
 
 from wxPython.wx import *

+from Main import opj

 
 import string
 import images
 
 import string
 import images


@@ -20,7 +21,11 @@ class TestPanel(wxPanel):
         wxStaticBitmap(self, -1, bmp, wxPoint(80, 50),
                        wxSize(bmp.GetWidth(), bmp.GetHeight()))
 
         wxStaticBitmap(self, -1, bmp, wxPoint(80, 50),
                        wxSize(bmp.GetWidth(), bmp.GetHeight()))
 

-        bmp = images.getRobinBitmap()
+        # 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))
 
         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.",