Change how/when the app object is created

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23904 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/wxPython/tools/img2img.py b/wxPython/wxPython/tools/img2img.py
index 4d73512762917d12afc5b9419655ada5536e9250..a405fb112ce6192713b20468de939cfa2151ed10 100644 (file)
--- a/wxPython/wxPython/tools/img2img.py
+++ b/wxPython/wxPython/tools/img2img.py
@@ -13,9 +13,6 @@
 import sys, os, glob, getopt
 from wxPython.wx import *
 
-# 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 2ddfee329e93e735d330dfa577a247ed2b914b5e..60201a4cf39641b6133b61123eb276e82de025f3 100644 (file)
--- 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 719b19d4839b3248dff821a274fc74793570f355..bd510ff3e901f1a6e553d2cb0a2f6b9c518e26e4 100644 (file)
--- 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 e49bff180ab931372715b71d7e48f3b5c21088a8..08c1b9743761a726e68e53e7193429e11e581e99 100644 (file)
--- 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__)