Removed unnecessary files, removed or replaced images that we're not

sure of their origin or license.


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

wxPython/demo/Calendar.py

@@ -122,23 +122,14 @@ class TestPanel(wx.Panel):
         self.Bind(wx.EVT_SPIN, self.OnSpin, self.spin)
 
         # button for calendar dialog test
-
-        wx.StaticText(self, -1, "Test Calendar Dialog", (350, 50), (150, -1))
-
-        bmp = images.getCalendarBitmap()
-        self.but1 = wx.BitmapButton(self, -1, bmp, (380, 80))
+        self.but1 = wx.Button(self, -1, "Test Calendar Dialog", (380, 80))
         self.Bind(wx.EVT_BUTTON, self.TestDlg, self.but1)
 
         # button for calendar window test
-
-        wx.StaticText(self, -1, "Test Calendar Window", (350, 150), (150, -1))
-
-        self.but2 = wx.BitmapButton(self, -1, bmp, (380, 180))
+        self.but2 = wx.Button(self, -1, "Test Calendar Window", (380, 180))
         self.Bind(wx.EVT_BUTTON, self.TestFrame, self.but2)
 
-        wx.StaticText(self, -1, "Test Calendar Print", (350, 250), (150, -1))
-
-        self.but3 = wx.BitmapButton(self, -1, bmp, (380, 280))
+        self.but3 = wx.Button(self, -1, "Test Calendar Print", (380, 280))
         self.Bind(wx.EVT_BUTTON, self.OnPreview, self.but3)
 
         # calendar dialog

wxPython/demo/Cursor.py

@@ -79,19 +79,18 @@ class TestPanel(wx.Panel):
     def OnChooseCursor(self, evt):
         # clear the dots
         self.win.Refresh()
-        
-        choice = self.cb.GetStringSelection()
+
+        choice = evt.GetString() #self.cb.GetStringSelection()
         self.log.write("Selecting the %s cursor\n" % choice)
 
         cnum = cursors[choice]
         
         if cnum == CUSTOMID:
-            image = images.getBlom12Image()
-            image.SetMaskColour(255, 255, 255)
+            image = images.getPointyImage()
 
             # since this image didn't come from a .cur file, tell it where the hotspot is
-            image.SetOptionInt(wx.IMAGE_OPTION_CUR_HOTSPOT_X, 0)
-            image.SetOptionInt(wx.IMAGE_OPTION_CUR_HOTSPOT_Y, 22)
+            image.SetOptionInt(wx.IMAGE_OPTION_CUR_HOTSPOT_X, 1)
+            image.SetOptionInt(wx.IMAGE_OPTION_CUR_HOTSPOT_Y, 1)
 
             # make the image into a cursor
             cursor = wx.CursorFromImage(image)

wxPython/demo/DragImage.py

@@ -51,7 +51,7 @@ class DragCanvas(wx.ScrolledWindow):
         # Make a shape from an image and mask.  This one will demo
         # dragging outside the window
         bmp = images.getTestStarBitmap()
-        ##bmp = wx.Bitmap('bitmaps/toucan.png')
+        #bmp = wx.Bitmap('bitmaps/toucan.png')
         shape = DragShape(bmp)
         shape.pos = (5, 5)
         shape.fullscreen = True
@@ -83,17 +83,10 @@ class DragCanvas(wx.ScrolledWindow):
         self.shapes.append(shape)
 
 
-        # Make some shapes from some playing card images.
-        x = 200
-
-        for card in ['_01c_', '_12h_', '_13d_', '_10s_']:
-            bmpFunc = getattr(images, "get%sBitmap" % card)
-            bmp = bmpFunc()
-            shape = DragShape(bmp)
-            shape.pos = (x, 5)
-            self.shapes.append(shape)
-            x = x + 80
-
+        bmp = images.getTheKidBitmap()
+        shape = DragShape(bmp)
+        shape.pos = (200, 5)
+        self.shapes.append(shape)
 
         self.Bind(wx.EVT_ERASE_BACKGROUND, self.OnEraseBackground)
         self.Bind(wx.EVT_PAINT, self.OnPaint)

wxPython/demo/FloatBar.py

@@ -32,20 +32,26 @@ class TestFloatBar(wx.Frame):
         tb.SetTitle("Floating!")
         self.CreateStatusBar()
 
-        tb.AddSimpleTool(10, images.getNewBitmap(), "New", "Long help for 'New'")
+        tsize = (16,16)
+        new_bmp =  wx.ArtProvider.GetBitmap(wx.ART_NORMAL_FILE, wx.ART_TOOLBAR, tsize)
+        open_bmp = wx.ArtProvider.GetBitmap(wx.ART_FILE_OPEN, wx.ART_TOOLBAR, tsize)
+        copy_bmp = wx.ArtProvider.GetBitmap(wx.ART_COPY, wx.ART_TOOLBAR, tsize)
+        paste_bmp= wx.ArtProvider.GetBitmap(wx.ART_PASTE, wx.ART_TOOLBAR, tsize)
+
+        tb.AddSimpleTool(10, new_bmp, "New", "Long help for 'New'")
         self.Bind(wx.EVT_TOOL, self.OnToolClick, id=10)
         self.Bind(wx.EVT_TOOL_RCLICKED, self.OnToolRClick, id=10)
 
-        tb.AddSimpleTool(20, images.getOpenBitmap(), "Open")
+        tb.AddSimpleTool(20, open_bmp, "Open")
         self.Bind(wx.EVT_TOOL, self.OnToolClick, id=20)
         self.Bind(wx.EVT_TOOL_RCLICKED, self.OnToolRClick, id=20)
 
         tb.AddSeparator()
-        tb.AddSimpleTool(30, images.getCopyBitmap(), "Copy")
+        tb.AddSimpleTool(30, copy_bmp, "Copy")
         self.Bind(wx.EVT_TOOL, self.OnToolClick, id=30)
         self.Bind(wx.EVT_TOOL_RCLICKED, self.OnToolRClick, id=30)
 
-        tb.AddSimpleTool(40, images.getPasteBitmap(), "Paste")
+        tb.AddSimpleTool(40, paste_bmp, "Paste")
         self.Bind(wx.EVT_TOOL, self.OnToolClick, id=40)
         self.Bind(wx.EVT_TOOL_RCLICKED, self.OnToolRClick, id=40)
 

wxPython/demo/GIFAnimationCtrl.py

@@ -5,13 +5,12 @@ from wx.animate import GIFAnimationCtrl
 from Main import opj
 
 GIFNames = [
-    "bitmaps/ani-bttrfly.gif",
-    "bitmaps/ani-avtr.gif",
-    "bitmaps/ani-phone.gif",
-#    "bitmaps/ani-walker.gif",
-    "bitmaps/ani-man.gif",
-    "bitmaps/ani-bookworm.gif",
-    "bitmaps/ani-hooked.gif",
+    'bitmaps/AG00178_.gif',
+    'bitmaps/BD13656_.gif',  
+    'bitmaps/AG00185_.gif',
+    'bitmaps/AG00039_.gif',
+    'bitmaps/AG00183_.gif',
+    'bitmaps/AG00028_.gif',
     ]
 
 #----------------------------------------------------------------------

wxPython/demo/Grid_MegaExample.py

@@ -198,8 +198,8 @@ class MegaImageRenderer(Grid.PyGridCellRenderer):
         self.table = table
         self._choices = [images.getSmilesBitmap,
                          images.getMondrianBitmap,
-                         images.get_10s_Bitmap,
-                         images.get_01c_Bitmap]
+                         images.getWXPdemoBitmap,
+                         ]
 
         self.colSize = None
         self.rowSize = None

wxPython/demo/Listbook.py

@@ -6,19 +6,7 @@ import images
 
 colourList = [ "Aquamarine", "Black", "Blue", "Blue Violet", "Brown", "Cadet Blue",
                "Coral", "Cornflower Blue", "Cyan", "Dark Grey", "Dark Green",
-               "Dark Olive Green", "Dark Orchid", "Dark Slate Blue",
-               "Dark Slate Grey", "Dark Turquoise", "Dim Grey", "Firebrick",
-               "Forest Green", "Gold", "Goldenrod", "Grey", "Green", "Green Yellow",
-               "Indian Red", "Khaki", "Light Blue", "Light Grey", "Light Steel Blue",
-               "Lime Green", "Magenta", "Maroon", "Medium Aquamarine", "Medium Blue",
-               "Medium Forest Green", "Medium Goldenrod", "Medium Orchid",
-               "Medium Sea Green", "Medium Slate Blue", "Medium Spring Green",
-               "Medium Turquoise", "Medium Violet Red", "Midnight Blue", "Navy",
-               "Orange", "Orange Red", "Orchid", "Pale Green", "Pink", "Plum",
-               "Purple", "Red", "Salmon", "Sea Green", "Sienna", "Sky Blue",
-               "Slate Blue", "Spring Green", "Steel Blue", "Tan", "Thistle",
-               "Turquoise", "Violet", "Violet Red", "Wheat", "White", "Yellow",
-               "Yellow Green"
+               "Dark Olive Green",
                ]
 
 #----------------------------------------------------------------------------
@@ -34,10 +22,10 @@ class TestLB(wx.Listbook):
                             )
         self.log = log
 
-        # make an image list using the BlomXX images
+        # make an image list using the LBXX images
         il = wx.ImageList(32, 32)
-        for x in range(1, 16):
-            f = getattr(images, 'getBlom%02dBitmap' % x)
+        for x in range(12):
+            f = getattr(images, 'getLB%02dBitmap' % (x+1))
             bmp = f()
             il.Add(bmp)
         self.AssignImageList(il)
@@ -55,8 +43,6 @@ class TestLB(wx.Listbook):
                           "You can put nearly any type of window here,\n"
                           "and the list can be on any side of the Listbook",
                           wx.Point(10, 10))
-                #st.SetForegroundColour(wxWHITE)
-                #st.SetBackgroundColour(wxBLUE)
                 first = False
 
         self.Bind(wx.EVT_LISTBOOK_PAGE_CHANGED, self.OnPageChanged)

wxPython/demo/Main.py

@@ -1080,8 +1080,7 @@ class DemoTaskBarIcon(wx.TaskBarIcon):
 
 
     def OnTaskBarChange(self, evt):
-        names = [ "WXPdemo", "WXP", "Mondrian", "Test2m",
-                  "Blom08m", "Blom10m", "Blom15m" ]
+        names = [ "WXPdemo", "Mondrian", "Pencil", "Carrot" ]                  
         name = names[self.imgidx]
         
         getFunc = getattr(images, "get%sImage" % name)
@@ -1675,18 +1674,22 @@ class wxPythonDemo(wx.Frame):
 
 class MySplashScreen(wx.SplashScreen):
     def __init__(self):
-        bmp = wx.Image(opj("bitmaps/splash.gif")).ConvertToBitmap()
+        bmp = wx.Image(opj("bitmaps/splash.png")).ConvertToBitmap()
         wx.SplashScreen.__init__(self, bmp,
                                  wx.SPLASH_CENTRE_ON_SCREEN | wx.SPLASH_TIMEOUT,
-                                 3000, None, -1)
+                                 5000, None, -1)
         self.Bind(wx.EVT_CLOSE, self.OnClose)
+        wx.FutureCall(2000, self.ShowMain)
 
     def OnClose(self, evt):
         self.Hide()
-        frame = wxPythonDemo(None, "wxPython: (A Demonstration)")
-        frame.Show()
         evt.Skip()  # Make sure the default handler runs too...
 
+    def ShowMain(self):
+        frame = wxPythonDemo(None, "wxPython: (A Demonstration)")
+        frame.Show()
+        self.Raise()
+        
 
 class MyApp(wx.App):
     def OnInit(self):
@@ -1705,7 +1708,7 @@ class MyApp(wx.App):
         # initialization, finally creating and showing the main
         # application window(s).  In this case we have nothing else to
         # do so we'll delay showing the main frame until later (see
-        # OnClose above) so the users can see the SplashScreen effect.        
+        # ShowMain above) so the users can see the SplashScreen effect.        
         splash = MySplashScreen()
         splash.Show()
 

wxPython/demo/ShapedWindow.py

@@ -25,7 +25,7 @@ class TestFrame(wx.Frame):
         self.Bind(wx.EVT_RIGHT_UP,      self.OnExit)
         self.Bind(wx.EVT_PAINT,         self.OnPaint)
 
-        self.bmp = images.getTuxBitmap()
+        self.bmp = images.getVippiBitmap()
         w, h = self.bmp.GetWidth(), self.bmp.GetHeight()
         self.SetClientSize( (w, h) )
 

wxPython/demo/SplitTree.py

@@ -16,7 +16,6 @@
 import  wx
 import  wx.gizmos as gizmos
 
-import  images
 
 #----------------------------------------------------------------------
 
@@ -27,8 +26,8 @@ class TestTree(gizmos.RemotelyScrolledTreeCtrl):
         # make an image list
         im1 = im2 = -1
         self.il = wx.ImageList(16, 16)
-        im1 = self.il.Add(images.getFolder1Bitmap())
-        im2 = self.il.Add(images.getFile1Bitmap())
+        im1 = self.il.Add(wx.ArtProvider.GetBitmap(wx.ART_FOLDER, wx.ART_TOOLBAR, (16,16)))
+        im2 = self.il.Add(wx.ArtProvider.GetBitmap(wx.ART_NORMAL_FILE, wx.ART_TOOLBAR, (16,16)))
         self.SetImageList(self.il)
 
         # Add some items

wxPython/demo/StyledTextCtrl_2.py

@@ -168,9 +168,17 @@ class PythonSTC(stc.StyledTextCtrl):
 
         # register some images for use in the AutoComplete box.
         self.RegisterImage(1, images.getSmilesBitmap())
-        self.RegisterImage(2, images.getFile1Bitmap())
-        self.RegisterImage(3, images.getCopy2Bitmap())
+        self.RegisterImage(2, self._fix_image(
+            wx.ArtProvider.GetBitmap(wx.ART_NORMAL_FILE, wx.ART_TOOLBAR, (16,16))))
+        self.RegisterImage(3, self._fix_image(
+            wx.ArtProvider.GetBitmap(wx.ART_COPY, wx.ART_TOOLBAR, (16,16))))
 
+    def _fix_image(self, bmp):
+        img = bmp.ConvertToImage()
+        if img.HasAlpha():
+            img.ConvertAlphaToMask()
+            bmp = wx.BitmapFromImage(img)
+        return bmp
 
     def OnKeyPressed(self, event):
         if self.CallTipActive():

wxPython/demo/Throbber.py

@@ -69,22 +69,11 @@ class TestPanel(wx.Panel):
             pointSize = 8, family = wx.DEFAULT, style = wx.NORMAL, weight = wx.BOLD
             ))
 
-        # this throbber is created using a single, composite image
-        self.otherThrobber = throb.Throbber(
-            self, -1, throbImages.catalog['eclouds'].getBitmap(), frameDelay = 0.15, 
-            frames = 12, frameWidth = 48, label = "Stop"
-            )
-
-
-        self.otherThrobber.Bind(wx.EVT_LEFT_DOWN, self.OnClickThrobber)
-
         box = wx.BoxSizer(wx.VERTICAL)
         sizer = wx.GridBagSizer()
         box.Add(sizer, 1, wx.EXPAND|wx.ALL, 5)
         sizer.AddGrowableCol(1)
 
-        sizer.Add(self.otherThrobber, (0, 2), (4, 1),flag = wx.ALIGN_CENTER_VERTICAL)
-
         row = 2
 
         # use a list so we can keep our order
@@ -127,9 +116,6 @@ class TestPanel(wx.Panel):
         for t in self.throbbers.keys():
             self.throbbers[t]['throbber'].Start()
 
-        self.otherThrobber.Start()
-        self.otherThrobber.Reverse()
-
         self.Bind(wx.EVT_WINDOW_DESTROY, self.OnDestroy)
 
     def OnDestroy(self, event):
@@ -144,16 +130,7 @@ class TestPanel(wx.Panel):
         for t in self.throbbers.keys():
             self.throbbers[t]['throbber'].Rest()
 
-    def OnClickThrobber(self, event):
-        if self.otherThrobber.Running():
-            self.otherThrobber.Rest()
-            self.otherThrobber.SetLabel("Start")
-        else:
-            self.otherThrobber.Start()
-            self.otherThrobber.SetLabel("Stop")
-
     def ShutdownDemo(self):
-        self.otherThrobber.Rest()
         for t in self.throbbers.keys():
             self.throbbers[t]['throbber'].Rest()
 

wxPython/demo/ToolBar.py

@@ -31,21 +31,27 @@ class TestToolBar(wx.Frame):
 
         self.CreateStatusBar()
 
-        tb.AddSimpleTool(10, images.getNewBitmap(), "New", "Long help for 'New'")
-        #tb.AddLabelTool(10, "New", images.getNewBitmap(), shortHelp="New", longHelp="Long help for 'New'")
+        tsize = (16,16)
+        new_bmp =  wx.ArtProvider.GetBitmap(wx.ART_NORMAL_FILE, wx.ART_TOOLBAR, tsize)
+        open_bmp = wx.ArtProvider.GetBitmap(wx.ART_FILE_OPEN, wx.ART_TOOLBAR, tsize)
+        copy_bmp = wx.ArtProvider.GetBitmap(wx.ART_COPY, wx.ART_TOOLBAR, tsize)
+        paste_bmp= wx.ArtProvider.GetBitmap(wx.ART_PASTE, wx.ART_TOOLBAR, tsize)
+        
+        tb.AddSimpleTool(10, new_bmp, "New", "Long help for 'New'")
+        #tb.AddLabelTool(10, "New", new_bmp, shortHelp="New", longHelp="Long help for 'New'")
         self.Bind(wx.EVT_TOOL, self.OnToolClick, id=10)
         self.Bind(wx.EVT_TOOL_RCLICKED, self.OnToolRClick, id=10)
 
-        tb.AddSimpleTool(20, images.getOpenBitmap(), "Open", "Long help for 'Open'")
+        tb.AddSimpleTool(20, open_bmp, "Open", "Long help for 'Open'")
         self.Bind(wx.EVT_TOOL, self.OnToolClick, id=20)
         self.Bind(wx.EVT_TOOL_RCLICKED, self.OnToolRClick, id=20)
 
         tb.AddSeparator()
-        tb.AddSimpleTool(30, images.getCopyBitmap(), "Copy", "Long help for 'Copy'")
+        tb.AddSimpleTool(30, copy_bmp, "Copy", "Long help for 'Copy'")
         self.Bind(wx.EVT_TOOL, self.OnToolClick, id=30)
         self.Bind(wx.EVT_TOOL_RCLICKED, self.OnToolRClick, id=30)
 
-        tb.AddSimpleTool(40, images.getPasteBitmap(), "Paste", "Long help for 'Paste'")
+        tb.AddSimpleTool(40, paste_bmp, "Paste", "Long help for 'Paste'")
         self.Bind(wx.EVT_TOOL, self.OnToolClick, id=40)
         self.Bind(wx.EVT_TOOL_RCLICKED, self.OnToolRClick, id=40)
 

wxPython/demo/data/test.htm

@@ -59,8 +59,6 @@ this is text......
 this is text......
 
 <br>
-Here is a GIF: <IMG SRC="pic2.gif">
-
 <BR>&nbsp;
 <BR>&nbsp;
 <UL>

wxPython/demo/encode_bitmaps.py

@@ -12,10 +12,6 @@ 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",
@@ -25,21 +21,15 @@ command_lines = [
     "-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 Copy2  -m #C0C0C0 bmp_source/copy2.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",
 
@@ -50,43 +40,33 @@ 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 Tux bmp_source/Tux.png images.py",
+    "-a -u -n Vippi bmp_source/Vippi.png images.py",
 
-
-    "-a -u -n Blom01 bmp_source/toblom01.png images.py",
-    "-a -u -n Blom02 bmp_source/toblom02.png images.py",
-    "-a -u -n Blom03 bmp_source/toblom03.png images.py",
-    "-a -u -n Blom04 bmp_source/toblom04.png images.py",
-    "-a -u -n Blom05 bmp_source/toblom05.png images.py",
-    "-a -u -n Blom06 bmp_source/toblom06.png images.py",
-    "-a -u -n Blom07 bmp_source/toblom07.png images.py",
-    "-a -u -n Blom08 bmp_source/toblom08.png images.py",
-    "-a -u -n Blom09 bmp_source/toblom09.png images.py",
-    "-a -u -n Blom10 bmp_source/toblom10.png images.py",
-    "-a -u -n Blom11 bmp_source/toblom11.png images.py",
-    "-a -u -n Blom12 bmp_source/toblom12.png images.py",
-    "-a -u -n Blom13 bmp_source/toblom13.png images.py",
-    "-a -u -n Blom14 bmp_source/toblom14.png images.py",
-    "-a -u -n Blom15 bmp_source/toblom15.png images.py",
-
-    "-a -u -n Blom08m -m #FFFFFF bmp_source/toblom08.png images.py",
-    "-a -u -n Blom10m -m #FFFFFF bmp_source/toblom10.png images.py",
-    "-a -u -n Blom15m -m #FFFFFF bmp_source/toblom15.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 WXP bmp_source/wxp.ico images.py",
     "-a -u -i -n WXPdemo bmp_source/wxpdemo.ico images.py",
 
 
@@ -121,7 +101,6 @@ 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",
     ]