version number

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

diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index d2570166e7ede2bef76deab17cce5e2c86dee0df..8d46fc7e9b36b12f31817158fafcfb6da07a3ff9 100644 (file)
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -961,8 +961,9 @@ class DemoTaskBarIcon(wx.TaskBarIcon):
         self.frame = frame
 
         # Set the image
         self.frame = frame
 
         # Set the image

-        icon = self.MakeIcon(images.getMondrianImage())
+        icon = self.MakeIcon(images.getWXPdemoImage())

         self.SetIcon(icon, "wxPython Demo")
         self.SetIcon(icon, "wxPython Demo")

+        self.imgidx = 1

         
         # bind some events
         self.Bind(wx.EVT_TASKBAR_LEFT_DCLICK, self.OnTaskBarActivate)
         
         # bind some events
         self.Bind(wx.EVT_TASKBAR_LEFT_DCLICK, self.OnTaskBarActivate)


@@ -994,10 +995,10 @@ class DemoTaskBarIcon(wx.TaskBarIcon):
         icon size...
         """
         if "wxMSW" in wx.PlatformInfo:
         icon size...
         """
         if "wxMSW" in wx.PlatformInfo:

-            img.Scale(16, 16)
+            img = img.Scale(16, 16)

         elif "wxGTK" in wx.PlatformInfo:
         elif "wxGTK" in wx.PlatformInfo:

-            img.Scale(20, 20)
-        # wxMac can be any size upto 128.128....
+            img = img.Scale(22, 22)
+        # wxMac can be any size upto 128x128, so leave the source img alone....

         icon = wx.IconFromBitmap(img.ConvertToBitmap() )
         return icon
     
         icon = wx.IconFromBitmap(img.ConvertToBitmap() )
         return icon
     


@@ -1015,8 +1016,17 @@ class DemoTaskBarIcon(wx.TaskBarIcon):
 
 
     def OnTaskBarChange(self, evt):
 
 
     def OnTaskBarChange(self, evt):

-        icon = self.MakeIcon(images.getBlom10MaskedImage())
-        self.SetIcon(icon, "This is a new icon")
+        names = [ "WXPdemo", "WXP", "Mondrian", "Test2m",
+                  "Blom08m", "Blom10m", "Blom15m" ]
+        name = names[self.imgidx]
+        
+        getFunc = getattr(images, "get%sImage" % name)
+        self.imgidx += 1
+        if self.imgidx >= len(names):
+            self.imgidx = 0
+            
+        icon = self.MakeIcon(getFunc())
+        self.SetIcon(icon, "This is a new icon: " + name)

 
 
     def OnTaskBarRemove(self, evt):
 
 
     def OnTaskBarRemove(self, evt):


@@ -1039,7 +1049,7 @@ class wxPythonDemo(wx.Frame):
         self.shell = None
         self.firstTime = True
 
         self.shell = None
         self.firstTime = True
 

-        icon = images.getMondrianIcon()
+        icon = images.getWXPdemoIcon()

         self.SetIcon(icon)
 
         self.tbicon = DemoTaskBarIcon(self)
         self.SetIcon(icon)
 
         self.tbicon = DemoTaskBarIcon(self)


@@ -1078,7 +1088,7 @@ class wxPythonDemo(wx.Frame):
  
         item = menu.Append(-1, 'E&xit\tAlt-X', 'Get the heck outta here!')
         self.Bind(wx.EVT_MENU, self.OnFileExit, item)
  
         item = menu.Append(-1, 'E&xit\tAlt-X', 'Get the heck outta here!')
         self.Bind(wx.EVT_MENU, self.OnFileExit, item)

-        wx.App_SetMacExitMenuItemId(item.GetId())
+        wx.App.SetMacExitMenuItemId(item.GetId())

         self.mainmenu.Append(menu, '&File')
 
         # Make a Demo menu
         self.mainmenu.Append(menu, '&File')
 
         # Make a Demo menu


@@ -1118,7 +1128,7 @@ class wxPythonDemo(wx.Frame):
                                 'An interactive interpreter window with the demo app and frame objects in the namesapce')
         menu.AppendSeparator()
         helpItem = menu.Append(-1, '&About\tCtrl-H', 'wxPython RULES!!!')
                                 'An interactive interpreter window with the demo app and frame objects in the namesapce')
         menu.AppendSeparator()
         helpItem = menu.Append(-1, '&About\tCtrl-H', 'wxPython RULES!!!')

-        wx.App_SetMacAboutMenuItemId(helpItem.GetId())
+        wx.App.SetMacAboutMenuItemId(helpItem.GetId())

 
         self.Bind(wx.EVT_MENU, self.OnOpenShellWindow, shellItem)
         self.Bind(wx.EVT_MENU, self.OnHelpAbout, helpItem)
 
         self.Bind(wx.EVT_MENU, self.OnOpenShellWindow, shellItem)
         self.Bind(wx.EVT_MENU, self.OnHelpAbout, helpItem)