fix Union(empty rect) bug

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

diff --git a/wxPython/demo/encode_bitmaps.py b/wxPython/demo/encode_bitmaps.py
index b4845b7f0e484cc10648cfd7d1036454e7a8ed4b..489e6f6e64b26470f96a029dcc2cbc09cc7e8545 100644 (file)
--- a/wxPython/demo/encode_bitmaps.py
+++ b/wxPython/demo/encode_bitmaps.py
@@ -7,46 +7,58 @@ files...
 """
 
 import sys, string
-sys.path.insert(0, "../tools")
-
-import img2py
+from wxPython.tools import img2py
 
 
 command_lines = [
-    "   -n Mondrian bmp_source/mondrian.ico images.py",
-
-    "-a -n _10s_ bmp_source/10s.gif images.py",
-    "-a -n _01c_ bmp_source/01c.gif images.py",
-    "-a -n _12h_ bmp_source/12h.gif images.py",
-    "-a -n _13d_ bmp_source/13d.gif images.py",
-    "-a -n Background bmp_source/backgrnd.png images.py",
-    "-a -n TestStar -m #FFFFFF bmp_source/teststar.png images.py",
-    "-a -n TestStar2 bmp_source/teststar.png images.py",
-    "-a -n TestMask bmp_source/testmask.bmp images.py",
-
-    "-a -n Test2 bmp_source/test2.bmp images.py",
-#    "-a -n Robin bmp_source/robin.jpg images.py",
-
-    "-a -n Bulb1 bmp_source/lb1.bmp images.py",
-    "-a -n Bulb2 bmp_source/lb2.bmp images.py",
-
-    "-a -n Calendar bmp_source/Calend.bmp images.py",
-    "-a -n DbDec bmp_source/DbDec.bmp images.py",
-    "-a -n Dec bmp_source/Dec.bmp images.py",
-    "-a -n Pt bmp_source/Pt.bmp images.py",
-    "-a -n DbInc bmp_source/DbInc.bmp images.py",
-    "-a -n Inc bmp_source/Inc.bmp images.py",
-
-    "-a -n New   -m #C0C0C0 bmp_source/new.bmp images.py",
-    "-a -n Open  -m #C0C0C0 bmp_source/open.bmp images.py",
-    "-a -n Copy  -m #C0C0C0 bmp_source/copy.bmp images.py",
-    "-a -n Paste -m #C0C0C0 bmp_source/paste.bmp images.py",
-    "-a -n Tog1  -m #C0C0C0 bmp_source/tog1.bmp images.py",
-    "-a -n Tog2  -m #C0C0C0 bmp_source/tog2.bmp images.py",
-
-    "-a -n Smiles -m #FFFFFF bmp_source/smiles.bmp images.py",
-
-    "-a -n GridBG bmp_source/GridBG.gif images.py",
+    "   -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 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 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",
+
+    "-a -u -n Smiles -m #FFFFFF bmp_source/smiles2.bmp images.py",
+
+    "-a -u -n GridBG bmp_source/GridBG.gif images.py",
+
+    "-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",
 
     ]