some methods missing wxPyBeginBlockThreads/wxPyEndBlockThreads

[wxWidgets.git] / wxPython / wx / lib / editor / images.py

diff --git a/wxPython/wx/lib/editor/images.py b/wxPython/wx/lib/editor/images.py
index 2b934513e94dbb7c8046d036965bdb9bab04e715..982a8c4fb3f0806ff12bcc8c49db33cb72e4ff2f 100644 (file)
--- a/wxPython/wx/lib/editor/images.py
+++ b/wxPython/wx/lib/editor/images.py
@@ -1,17 +1,22 @@
 
 # images converted with wxPython's img2py.py tool
 
-from wxPython.wx import wxImageFromStream, wxBitmapFromImage
-import cStringIO
+# 12/14/2003 - Jeff Grimmett (grimmtooth@softhome.net)
+#
+# o 2.5 compatability update.
+#
+
+import  cStringIO
+import  wx
 
 ##----------- Common Functions
 
 def GetBitmap(ImageData):
-    return wxBitmapFromImage(GetImage(ImageData))
+    return wx.BitmapFromImage(GetImage(ImageData))
 
 def GetImage(ImageData):
     stream = cStringIO.StringIO(ImageData)
-    return wxImageFromStream(stream)
+    return wx.ImageFromStream(stream)
 
 ##----------- Image Data