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/branches/WX_2_4_BRANCH@34325 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

wxPython/demo/Main.py

@@ -756,7 +756,7 @@ 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,
                                 4000, None, -1,

wxPython/demo/ShapedWindow.py

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

wxPython/demo/Throbber.py

@@ -32,7 +32,7 @@ class TestPanel(wxPanel):
 
         images = [throbImages.catalog[i].getBitmap()
                   for i in throbImages.index
-                  if i not in ['eclouds', 'logo']]
+                  if i not in ['logo']]
 
         self.throbbers['plain']['throbber'] = Throbber(self, -1,
                                                        images, size=(36, 36),
@@ -68,24 +68,13 @@ class TestPanel(wxPanel):
                                                                   weight = wxBOLD))
 
 
-        # this throbber is created using a single, composite image
-        self.otherThrobber = Throbber(self, -1,
-                                      throbImages.catalog['eclouds'].getBitmap(), #size=(48, 48),
-                                      frameDelay = 0.15,
-                                      frames = 12,
-                                      frameWidth = 48,
-                                      label = "Stop")
 
 
-        EVT_LEFT_DOWN(self.otherThrobber, self.OnClickThrobber)
-
         box = wxBoxSizer(wxVERTICAL)
         sizer = RowColSizer()
         box.Add(sizer, 1, wxEXPAND|wxALL, 5)
         sizer.AddGrowableCol(1)
 
-        sizer.Add(self.otherThrobber, row = 0, col = 2, rowspan = 4, flag = wxALIGN_CENTER_VERTICAL)
-
         row = 2
         # use a list so we can keep our order
         for t in ['plain', 'reverse', 'autoreverse', 'label', 'overlay', 'overlay+text']:
@@ -120,8 +109,6 @@ class TestPanel(wxPanel):
 
         for t in self.throbbers.keys():
             self.throbbers[t]['throbber'].Start()
-        self.otherThrobber.Start()
-        self.otherThrobber.Reverse()
 
         EVT_WINDOW_DESTROY(self, self.OnDestroy)
 
@@ -137,16 +124,7 @@ class TestPanel(wxPanel):
         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/data/test.htm

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

wxPython/demo/encode_bitmaps.py

@@ -13,10 +13,7 @@ from wxPython.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 TheKid bmp_source/thekid.png 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,10 +22,9 @@ command_lines = [
     "-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 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",
@@ -61,7 +57,7 @@ command_lines = [
     "-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",
 
 
     "   -u -c bmp_source/001.png throbImages.py",

wxPython/demo/wxCalendar.py

@@ -107,25 +107,18 @@ class TestPanel(wxPanel):
 
 # button for calendar dialog test
 
-        wxStaticText(self, -1, "Test Calendar Dialog", wxPoint(350, 50), wxSize(150, -1))
-
         mID = wxNewId()
-        bmp = images.getCalendarBitmap()
-        self.but = wxBitmapButton(self, mID, bmp, wxPoint(380, 80))#, wxSize(30, 30))
+        self.but = wxButton(self, mID, "Test Calendar Dialog", wxPoint(380, 80))#, wxSize(30, 30))
         EVT_BUTTON(self, mID, self.TestDlg)
 
 # button for calendar window test
 
-        wxStaticText(self, -1, "Test Calendar Window", wxPoint(350, 150), wxSize(150, -1))
-
         mID = wxNewId()
-        self.but = wxBitmapButton(self, mID, bmp, wxPoint(380, 180))#, wxSize(30, 30))
+        self.but = wxButton(self, mID, "Test Calendar Window", wxPoint(380, 180))#, wxSize(30, 30))
         EVT_BUTTON(self, mID, self.TestFrame)
 
-        wxStaticText(self, -1, "Test Calendar Print", wxPoint(350, 250), wxSize(150, -1))
-
         mID = wxNewId()
-        self.but = wxBitmapButton(self, mID, bmp, wxPoint(380, 280))#, wxSize(30, 30))
+        self.but = wxButton(self, mID, "Test Calendar Print", wxPoint(380, 280))#, wxSize(30, 30))
         EVT_BUTTON(self, mID, self.OnPreview)
 
 # calendar dialog

wxPython/demo/wxDragImage.py

@@ -83,17 +83,10 @@ class DragCanvas(wxScrolledWindow):
         shape.text = "Some dragging text"
         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 = wxPoint(x, 5)
-            self.shapes.append(shape)
-            x = x + 80
-
+        bmp = images.getTheKidBitmap()
+        shape = DragShape(bmp)
+        shape.pos = wxPoint(200, 5)
+        self.shapes.append(shape)
 
         EVT_ERASE_BACKGROUND(self, self.OnEraseBackground)
         EVT_PAINT(self, self.OnPaint)

wxPython/src/wxc.rc

@@ -1,4 +1,3 @@
-aa_wxpicon ICON "wxp.ico"
 #include "wx/msw/wx.rc"