compilation fix for WXWIN_COMPATIBILITY_2_2 (bug 1252476)

[wxWidgets.git] / wxPython / demo / encode_bitmaps.py

diff --git a/wxPython/demo/encode_bitmaps.py b/wxPython/demo/encode_bitmaps.py
index b3d027eb11320b4435b726b71c6a0ba7da67d918..701ffc8599da908767ccf9ac9db94b629551e2f6 100644 (file)
--- a/wxPython/demo/encode_bitmaps.py
+++ b/wxPython/demo/encode_bitmaps.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-#----------------------------------------------------------------------
 
 """
 This is a way to save the startup time when running img2py on lots of
@@ -7,38 +5,31 @@ files...
 """
 
 import sys
-from wxPython.tools import img2py
+
+from wx.tools import img2py
 
 
 command_lines = [
     "   -u -i -n Mondrian bmp_source/mondrian.ico images.py",
 
-    "-a -u -n _10s_ bmp_source/10s.gif images.py",
-    "-a -u -n _01c_ bmp_source/01c.gif images.py",
-    "-a -u -n _12h_ bmp_source/12h.gif images.py",
-    "-a -u -n _13d_ bmp_source/13d.gif images.py",
     "-a -u -n Background bmp_source/backgrnd.png images.py",
     "-a -u -n TestStar -m #FFFFFF bmp_source/teststar.png images.py",
     "-a -u -n TestStar2 bmp_source/teststar.png images.py",
     "-a -u -n TestMask bmp_source/testmask.bmp images.py",
 
     "-a -u -n Test2 bmp_source/test2.bmp images.py",
+    "-a -u -n Test2m -m #0000FF  bmp_source/test2.bmp images.py",
     "-a -u -n Robin bmp_source/robin.jpg images.py",
 
-    "-a -u -n Bulb1 bmp_source/lb1.bmp images.py",
-    "-a -u -n Bulb2 bmp_source/lb2.bmp images.py",
+    "-a -u -n Bulb1 bmp_source/bulb1.bmp images.py",
+    "-a -u -n Bulb2 bmp_source/bulb2.bmp images.py",
 
-    "-a -u -n Calendar bmp_source/Calend.bmp images.py",
     "-a -u -n DbDec bmp_source/DbDec.bmp images.py",
     "-a -u -n Dec bmp_source/Dec.bmp images.py",
     "-a -u -n Pt bmp_source/Pt.bmp images.py",
     "-a -u -n DbInc bmp_source/DbInc.bmp images.py",
     "-a -u -n Inc bmp_source/Inc.bmp images.py",
 
-    "-a -u -n New   -m #C0C0C0 bmp_source/new.bmp images.py",
-    "-a -u -n Open  -m #C0C0C0 bmp_source/open.bmp images.py",
-    "-a -u -n Copy  -m #C0C0C0 bmp_source/copy.bmp images.py",
-    "-a -u -n Paste -m #C0C0C0 bmp_source/paste.bmp images.py",
     "-a -u -n Tog1  -m #C0C0C0 bmp_source/tog1.bmp images.py",
     "-a -u -n Tog2  -m #C0C0C0 bmp_source/tog2.bmp images.py",
 
@@ -49,17 +40,34 @@ command_lines = [
     "-a -u -n SmallUpArrow  -m #0000FF bmp_source/sm_up.bmp images.py",
     "-a -u -n SmallDnArrow  -m #0000FF bmp_source/sm_down.bmp images.py",
 
-    "-a -u -n Folder1 -m #FFFFFF bmp_source/folder1.bmp images.py",
-    "-a -u -n Folder2 -m #FFFFFF bmp_source/folder2.bmp images.py",
-    "-a -u -n Folder3 -m #FFFFFF bmp_source/folder3.bmp images.py",
-    "-a -u -n File1   -m #FFFFFF bmp_source/file1.bmp   images.py",
-    "-a -u -n File2   -m #FFFFFF bmp_source/file2.bmp   images.py",
-
     "-a -u -n NoIcon  bmp_source/noicon.png  images.py",
 
     "-a -u -n WizTest1 bmp_source/wiztest1.bmp images.py",
     "-a -u -n WizTest2 bmp_source/wiztest2.bmp images.py",
 
+    "-a -u -n Vippi bmp_source/Vippi.png images.py",
+
+    "-a -u -n LB01 bmp_source/LB01.png images.py",
+    "-a -u -n LB02 bmp_source/LB02.png images.py",
+    "-a -u -n LB03 bmp_source/LB03.png images.py",
+    "-a -u -n LB04 bmp_source/LB04.png images.py",
+    "-a -u -n LB05 bmp_source/LB05.png images.py",
+    "-a -u -n LB06 bmp_source/LB06.png images.py",
+    "-a -u -n LB07 bmp_source/LB07.png images.py",
+    "-a -u -n LB08 bmp_source/LB08.png images.py",
+    "-a -u -n LB09 bmp_source/LB09.png images.py",
+    "-a -u -n LB10 bmp_source/LB10.png images.py",
+    "-a -u -n LB11 bmp_source/LB11.png images.py",
+    "-a -u -n LB12 bmp_source/LB12.png images.py",
+
+    "-a -u -n FloatCanvas bmp_source/floatcanvas.png images.py",
+    "-a -u -n TheKid bmp_source/thekid.png images.py",
+
+    "-a -u -n Carrot bmp_source/carrot.png images.py",
+    "-a -u -n Pointy bmp_source/pointy.png images.py",
+    "-a -u -n Pencil bmp_source/pencil.png images.py",
+    
+    "-a -u -i -n WXPdemo bmp_source/wxpdemo.ico images.py",
 
 
     "   -u -c bmp_source/001.png throbImages.py",
@@ -93,13 +101,13 @@ command_lines = [
     "-a -u -c bmp_source/029.png throbImages.py",
     "-a -u -c bmp_source/030.png throbImages.py",
 
-    "-a -u -c bmp_source/eclouds.png throbImages.py",
     "-a -u -c bmp_source/logo.png    throbImages.py",
     "-a -u -c bmp_source/rest.png    throbImages.py",
     ]
 
 
-for line in command_lines:
-    args = line.split()
-    img2py.main(args)
+if __name__ == "__main__":
+    for line in command_lines:
+        args = line.split()
+        img2py.main(args)