In GetPath(), don't append separator if there's already one at the end

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

diff --git a/wxPython/demo/wxStaticBitmap.py b/wxPython/demo/wxStaticBitmap.py
index edaf6c8fb9b012603be09c642909e4a6da4b38bb..1b057913ef3a93da40b0b6c9dc921a985a57c130 100644 (file)
--- a/wxPython/demo/wxStaticBitmap.py
+++ b/wxPython/demo/wxStaticBitmap.py
@@ -1,5 +1,6 @@
 
 from wxPython.wx import *
+from Main import opj
 
 import string
 import images
@@ -20,11 +21,7 @@ class TestPanel(wxPanel):
         wxStaticBitmap(self, -1, bmp, wxPoint(80, 50),
                        wxSize(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('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.",