Fix rawbitmap sample to clear bitmap first.

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

diff --git a/wxPython/wx/tools/img2img.py b/wxPython/wx/tools/img2img.py
index a405fb112ce6192713b20468de939cfa2151ed10..0f3595b359b1380e176dac139b97b3881beb25ac 100644 (file)
--- a/wxPython/wx/tools/img2img.py
+++ b/wxPython/wx/tools/img2img.py
@@ -8,25 +8,31 @@
 # Copyright:   (c) 2002 by Total Control Software
 # Licence:     wxWindows license
 #----------------------------------------------------------------------
+# 12/21/2003 - Jeff Grimmett (grimmtooth@softhome.net)
+#
+# o V2.5 compatability update 
+#
 
+import  getopt
+import  glob
+import  os
+import  sys
 
-import sys, os, glob, getopt
-from wxPython.wx import *
-
+import  wx
 
 def convert(file, maskClr, outputDir, outputName, outType, outExt):
     if os.path.splitext(file)[1].lower() == ".ico":
-        icon = wxIcon(file, wxBITMAP_TYPE_ICO)
-        img = wxBitmapFromIcon(icon)
+        icon = wx.Icon(file, wx.BITMAP_TYPE_ICO)
+        img = wx.BitmapFromIcon(icon)
     else:
-        img = wxBitmap(file, wxBITMAP_TYPE_ANY)
+        img = wx.Bitmap(file, wx.BITMAP_TYPE_ANY)
 
     if not img.Ok():
         return 0, file + " failed to load!"
     else:
         if maskClr:
             om = img.GetMask()
-            mask = wxMaskColour(img, maskClr)
+            mask = wx.Mask(img, maskClr)
             img.SetMask(mask)
             if om is not None:
                 om.Destroy()
@@ -38,7 +44,7 @@ def convert(file, maskClr, outputDir, outputName, outType, outExt):
         if img.SaveFile(newname, outType):
             return 1, file + " converted to " + newname
         else:
-            img = wxImageFromBitmap(img)
+            img = wx.ImageFromBitmap(img)
             if img.SaveFile(newname, outType):
                 return 1, "ok"
             else: