warning fix

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

diff --git a/wxPython/demo/ArtProvider.py b/wxPython/demo/ArtProvider.py
index 26b88061b4cae90dfcf9d4c65fac04c013313eb0..91d7a9fafc843a7cc1dfb2e2cc612a3ddae09be9 100644 (file)
--- a/wxPython/demo/ArtProvider.py
+++ b/wxPython/demo/ArtProvider.py
@@ -27,13 +27,20 @@ ArtIDs = [ "wx.ART_ADD_BOOKMARK",
            "wx.ART_GO_TO_PARENT",
            "wx.ART_GO_HOME",
            "wx.ART_FILE_OPEN",
            "wx.ART_GO_TO_PARENT",
            "wx.ART_GO_HOME",
            "wx.ART_FILE_OPEN",

+           "wx.ART_FILE_SAVE",
+           "wx.ART_FILE_SAVE_AS",

            "wx.ART_PRINT",
            "wx.ART_HELP",
            "wx.ART_TIP",
            "wx.ART_REPORT_VIEW",
            "wx.ART_LIST_VIEW",
            "wx.ART_NEW_DIR",
            "wx.ART_PRINT",
            "wx.ART_HELP",
            "wx.ART_TIP",
            "wx.ART_REPORT_VIEW",
            "wx.ART_LIST_VIEW",
            "wx.ART_NEW_DIR",

+           "wx.ART_HARDDISK",
+           "wx.ART_FLOPPY",
+           "wx.ART_CDROM",
+           "wx.ART_REMOVABLE",

            "wx.ART_FOLDER",
            "wx.ART_FOLDER",

+           "wx.ART_FOLDER_OPEN",

            "wx.ART_GO_DIR_UP",
            "wx.ART_EXECUTABLE_FILE",
            "wx.ART_NORMAL_FILE",
            "wx.ART_GO_DIR_UP",
            "wx.ART_EXECUTABLE_FILE",
            "wx.ART_NORMAL_FILE",


@@ -43,6 +50,16 @@ ArtIDs = [ "wx.ART_ADD_BOOKMARK",
            "wx.ART_QUESTION",
            "wx.ART_WARNING",
            "wx.ART_INFORMATION",
            "wx.ART_QUESTION",
            "wx.ART_WARNING",
            "wx.ART_INFORMATION",

+           "wx.ART_MISSING_IMAGE",
+           "wx.ART_COPY",
+           "wx.ART_CUT",
+           "wx.ART_PASTE",
+           "wx.ART_DELETE",
+           "wx.ART_UNDO",
+           "wx.ART_REDO",
+           "wx.ART_QUIT",
+           "wx.ART_FIND",
+           "wx.ART_FIND_AND_REPLACE",

            ]
 
 
            ]
 
 


@@ -155,7 +172,7 @@ class TestPanel(wx.Panel):
         text = wx.StaticText(self, -1, "48x48")
         box.Add(text, 0, wx.ALIGN_CENTRE|wx.ALL, 5)
 
         text = wx.StaticText(self, -1, "48x48")
         box.Add(text, 0, wx.ALIGN_CENTRE|wx.ALL, 5)
 

-        fgs.AddSizer(box, 0, wx.ALIGN_CENTRE|wx.ALL, 5)
+        fgs.Add(box, 0, wx.ALIGN_CENTRE|wx.ALL, 5)

         sizer.Add(fgs, 0, wx.ALL, 5)
         self.SetSizer(sizer)
 
         sizer.Add(fgs, 0, wx.ALL, 5)
         self.SetSizer(sizer)
 


@@ -192,25 +209,35 @@ class TestPanel(wx.Panel):
         bmp = wx.ArtProvider_GetBitmap(self.artid, self.client, (16,16))
 
         if not bmp.Ok():
         bmp = wx.ArtProvider_GetBitmap(self.artid, self.client, (16,16))
 
         if not bmp.Ok():

-            bmp = wxEmptyBitmap(16,16)
+            bmp = wx.EmptyBitmap(16,16)
+            self.clearBmp(bmp)

 
         self.bmp16.SetBitmap(bmp)
 
         bmp = wx.ArtProvider_GetBitmap(self.artid, self.client, (32,32))
 
         if not bmp.Ok():
 
         self.bmp16.SetBitmap(bmp)
 
         bmp = wx.ArtProvider_GetBitmap(self.artid, self.client, (32,32))
 
         if not bmp.Ok():

-            bmp = wxEmptyBitmap(32,32)
+            bmp = wx.EmptyBitmap(32,32)
+            self.clearBmp(bmp)

 
         self.bmp32.SetBitmap(bmp)
 
         bmp = wx.ArtProvider_GetBitmap(self.artid, self.client, (48,48))
 
         if not bmp.Ok():
 
         self.bmp32.SetBitmap(bmp)
 
         bmp = wx.ArtProvider_GetBitmap(self.artid, self.client, (48,48))
 
         if not bmp.Ok():

-            bmp = wxEmptyBitmap(48,48)
+            bmp = wx.EmptyBitmap(48,48)
+            self.clearBmp(bmp)

 
         self.bmp48.SetBitmap(bmp)
 
 
 
         self.bmp48.SetBitmap(bmp)
 
 

+    def clearBmp(self, bmp):
+        dc = wx.MemoryDC()
+        dc.SelectObject(bmp)
+        dc.SetBackground(wx.Brush("white"))
+        dc.Clear()
+        
+

 #----------------------------------------------------------------------
 
 def runTest(frame, nb, log):
 #----------------------------------------------------------------------
 
 def runTest(frame, nb, log):


@@ -849,7 +876,7 @@ V\xab\x95\xb2\xd9,y<\x1e2\x18\x0c\x8ak\xb5Z-9\x9dN*\x14\n\xdf\x9e\x9c$@*\x95\
 if __name__ == '__main__':
     import sys,os
     import run
 if __name__ == '__main__':
     import sys,os
     import run

-    run.main(['', os.path.basename(sys.argv[0])])
+    run.main(['', os.path.basename(sys.argv[0])] + sys.argv[1:])