]> git.saurik.com Git - wxWidgets.git/blobdiff - wxPython/demo/ArtProvider.py
'[1219035] cleanup: miscellaneous' and minor source cleaning.
[wxWidgets.git] / wxPython / demo / ArtProvider.py
index e0ce3ba9dbd08609bb259d15765ffb6525d5a33f..336dbbee8658644788615595ead801b77124e903 100644 (file)
@@ -27,13 +27,20 @@ ArtIDs = [ "wx.ART_ADD_BOOKMARK",
            "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_HARDDISK",
+           "wx.ART_FLOPPY",
+           "wx.ART_CDROM",
+           "wx.ART_REMOVABLE",
            "wx.ART_FOLDER",
+           "wx.ART_FOLDER_OPEN",
            "wx.ART_GO_DIR_UP",
            "wx.ART_EXECUTABLE_FILE",
            "wx.ART_NORMAL_FILE",
@@ -43,6 +50,17 @@ ArtIDs = [ "wx.ART_ADD_BOOKMARK",
            "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_NEW",
+           "wx.ART_UNDO",
+           "wx.ART_REDO",
+           "wx.ART_QUIT",
+           "wx.ART_FIND",
+           "wx.ART_FIND_AND_REPLACE",
            ]
 
 
@@ -155,7 +173,7 @@ class TestPanel(wx.Panel):
         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)
 
@@ -192,25 +210,35 @@ class TestPanel(wx.Panel):
         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():
-            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():
-            bmp = wxEmptyBitmap(48,48)
+            bmp = wx.EmptyBitmap(48,48)
+            self.clearBmp(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):
@@ -231,11 +259,11 @@ the users can plug in their own wx.ArtProvider class and easily replace
 standard art with his/her own version. It is easy thing to do: all
 that is needed is to derive a class from wx.ArtProvider, override it's
 CreateBitmap method and register the provider with
-wx.ArtProvider_PushProvider.
+wx.ArtProvider.PushProvider.
 <p>
 
 This class can also be used to get the platform native icons as
-provided by wx.ArtProvider_GetBitmap or wx.ArtProvider_GetIcon methods.
+provided by wx.ArtProvider.GetBitmap or wx.ArtProvider.GetIcon methods.
 
 </body></html>
 """