fixed array tests compilation and a bug in obj array test

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

diff --git a/wxPython/demo/wxImage.py b/wxPython/demo/wxImage.py
index bed1c2ca8b5fcb9efe09b0874ddb2cf4533342ee..6a15003e85f12d3695696272e06f2f3ba188bf0b 100644 (file)
--- a/wxPython/demo/wxImage.py
+++ b/wxPython/demo/wxImage.py
@@ -1,13 +1,14 @@
 
 from wxPython.wx import *
+from Main import opj
 
 #----------------------------------------------------------------------
 
 def runTest(frame, nb, log):
-    bmp = wxImage('bitmaps/image.bmp', wxBITMAP_TYPE_BMP).ConvertToBitmap()
-    gif = wxImage('bitmaps/image.gif', wxBITMAP_TYPE_GIF).ConvertToBitmap()
-    png = wxImage('bitmaps/image.png', wxBITMAP_TYPE_PNG).ConvertToBitmap()
-    jpg = wxImage('bitmaps/image.jpg', wxBITMAP_TYPE_JPEG).ConvertToBitmap()
+    bmp = wxImage(opj('bitmaps/image.bmp'), wxBITMAP_TYPE_BMP).ConvertToBitmap()
+    gif = wxImage(opj('bitmaps/image.gif'), wxBITMAP_TYPE_GIF).ConvertToBitmap()
+    png = wxImage(opj('bitmaps/image.png'), wxBITMAP_TYPE_PNG).ConvertToBitmap()
+    jpg = wxImage(opj('bitmaps/image.jpg'), wxBITMAP_TYPE_JPEG).ConvertToBitmap()
 
     panel = wxPanel(nb, -1)
     pos = 10