From f14ed529f3a549afde1ad50b29e13ca4f13209a4 Mon Sep 17 00:00:00 2001 From: Michael Hipp Date: Sat, 29 Mar 2014 12:17:43 -0500 Subject: [PATCH] Update img2img.py Get rid of obsolete call to wx.BitmapFromIcon when converting '.ico' file ( per http://wxpython.org/Phoenix/docs/html/classic_vs_phoenix.html ) --- wx/tools/img2img.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/wx/tools/img2img.py b/wx/tools/img2img.py index 933516d0..595ecdc8 100644 --- a/wx/tools/img2img.py +++ b/wx/tools/img2img.py @@ -21,11 +21,7 @@ import sys import wx def convert(file, maskClr, outputDir, outputName, outType, outExt): - if os.path.splitext(file)[1].lower() == ".ico": - icon = wx.Icon(file, wx.BITMAP_TYPE_ICO) - img = wx.BitmapFromIcon(icon) - else: - img = wx.Bitmap(file, wx.BITMAP_TYPE_ANY) + img = wx.Bitmap(file, wx.BITMAP_TYPE_ANY) if not img.IsOk(): return 0, file + " failed to load!"