diff --git a/wxPython/wxPython/tools/img2img.py b/wxPython/wxPython/tools/img2img.py index 202b731276..a405fb112c 100644 --- a/wxPython/wxPython/tools/img2img.py +++ b/wxPython/wxPython/tools/img2img.py @@ -13,11 +13,6 @@ import sys, os, glob, getopt from wxPython.wx import * -if wxPlatform == "__WXGTK__": - # some bitmap related things need to have a wxApp initialized... - app = wxPySimpleApp() - -wxInitAllImageHandlers() def convert(file, maskClr, outputDir, outputName, outType, outExt): if os.path.splitext(file)[1].lower() == ".ico": diff --git a/wxPython/wxPython/tools/img2png.py b/wxPython/wxPython/tools/img2png.py index 2ddfee329e..60201a4cf3 100644 --- a/wxPython/wxPython/tools/img2png.py +++ b/wxPython/wxPython/tools/img2png.py @@ -37,6 +37,9 @@ import img2img from wxPython import wx def main(): + # some bitmap related things need to have a wxApp initialized... + if wx.wxGetApp() is None: + app = wx.wxPySimpleApp() img2img.main(sys.argv[1:], wx.wxBITMAP_TYPE_PNG, ".png", __doc__) if __name__ == '__main__': diff --git a/wxPython/wxPython/tools/img2py.py b/wxPython/wxPython/tools/img2py.py index 719b19d483..bd510ff3e9 100644 --- a/wxPython/wxPython/tools/img2py.py +++ b/wxPython/wxPython/tools/img2py.py @@ -115,6 +115,10 @@ def main(args): print __doc__ return + # some bitmap related things need to have a wxApp initialized... + if wx.wxGetApp() is None: + app = wx.wxPySimpleApp() + append = 0 compressed = 1 maskClr = None diff --git a/wxPython/wxPython/tools/img2xpm.py b/wxPython/wxPython/tools/img2xpm.py index e49bff180a..08c1b97437 100644 --- a/wxPython/wxPython/tools/img2xpm.py +++ b/wxPython/wxPython/tools/img2xpm.py @@ -37,6 +37,9 @@ import img2img from wxPython import wx def main(): + # some bitmap related things need to have a wxApp initialized... + if wx.wxGetApp() is None: + app = wx.wxPySimpleApp() img2img.main(sys.argv[1:], wx.wxBITMAP_TYPE_XPM, ".xpm", __doc__)