Allow for non-ascii text in resources

[wxWidgets.git] / wxPython / wx / tools / img2xpm.py

diff --git a/wxPython/wx/tools/img2xpm.py b/wxPython/wx/tools/img2xpm.py
index 08c1b9743761a726e68e53e7193429e11e581e99..9907d1d617c43807fbda839a5b1a9b4316c306b7 100644 (file)
--- a/wxPython/wx/tools/img2xpm.py
+++ b/wxPython/wx/tools/img2xpm.py
@@ -8,9 +8,13 @@
 # Copyright:   (c) 2002 by Total Control Software
 # Licence:     wxWindows license
 #----------------------------------------------------------------------
 # Copyright:   (c) 2002 by Total Control Software
 # Licence:     wxWindows license
 #----------------------------------------------------------------------

+# 12/21/2003 - Jeff Grimmett (grimmtooth@softhome.net)
+#
+# o V2.5 compatability update 
+#

 
 """
 
 """

-img2xpm.py  -- convert several image formats to XPM
+img2xpm.py  -- convert several image formats to XPM.

 
 Usage:
 
 
 Usage:
 


@@ -31,16 +35,17 @@ Options:
                    the -o option.
 """
 
                    the -o option.
 """
 

+import  sys
+import  wx
+import  img2img

 
 

-import sys
-import img2img
-from wxPython import wx
-
+app = None

 def main():
     # some bitmap related things need to have a wxApp initialized...
 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__)
+    if wx.GetApp() is None:
+        global app
+        app = wx.PySimpleApp()
+    img2img.main(sys.argv[1:], wx.BITMAP_TYPE_XPM, ".xpm", __doc__)

 
 
 if __name__ == '__main__':
 
 
 if __name__ == '__main__':