Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2026-01-06 03:50:06 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'patch-1' of https://github.com/MichaelHipp/Phoenix into MichaelHipp-patch-1

Browse Source 
Conflicts:
	wx/tools/img2img.py
This commit is contained in:
Robin Dunn
2015-02-10 20:20:57 -08:00
parent 263ea749d5 f14ed529f3
commit 76cf83468a
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wx/tools/img2img.py
View File

@@ -21,11 +21,7 @@ import sys
import wx import wx
def convert(file, maskClr, outputDir, outputName, outType, outExt): def convert(file, maskClr, outputDir, outputName, outType, outExt):
if os.path.splitext(file)[1].lower() == ".ico": img = wx.Bitmap(file, wx.BITMAP_TYPE_ANY)
img = wx.Bitmap(file, wx.BITMAP_TYPE_ICO)
else:
img = wx.Bitmap(file, wx.BITMAP_TYPE_ANY)
if not img.IsOk(): if not img.IsOk():
return 0, file + " failed to load!" return 0, file + " failed to load!"
else: else: