X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d14a1e28567de23c586bc80017073d0c39f8d18f..edd13c9d8a9a4493d6883e55248c5bc6871835b7:/wxPython/wx/lib/editor/images.py?ds=sidebyside diff --git a/wxPython/wx/lib/editor/images.py b/wxPython/wx/lib/editor/images.py index 2b934513e9..982a8c4fb3 100644 --- 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