just a little tweak

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

diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index 5edc12806a9c110c62fffdf5cca1eb8ced376599..a0f0f7645b393b6f3e8557c027325343e365d3f0 100644 (file)
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -50,6 +50,7 @@ _treeList = [
         'StockButtons',
         'Ticker',
         'Choicebook',
         'StockButtons',
         'Ticker',
         'Choicebook',

+        'ListCtrl_edit',

         ]),
 
     # managed windows == things with a (optional) caption you can close
         ]),
 
     # managed windows == things with a (optional) caption you can close


@@ -98,6 +99,7 @@ _treeList = [
         'ListBox',
         'ListCtrl',
         'ListCtrl_virtual',
         'ListBox',
         'ListCtrl',
         'ListCtrl_virtual',

+        'ListCtrl_edit',

         'Listbook',
         'Menu',
         'Notebook',
         'Listbook',
         'Menu',
         'Notebook',


@@ -398,8 +400,7 @@ try:
             # The rest remains unchanged.
 
             # Line numbers in margin
             # The rest remains unchanged.
 
             # Line numbers in margin

-            self.StyleSetSpec(wx.stc.STC_STYLE_LINENUMBER,'fore:#000000,back:#99A9C2')
-    
+            self.StyleSetSpec(wx.stc.STC_STYLE_LINENUMBER,'fore:#000000,back:#99A9C2')    

             # Highlighted brace
             self.StyleSetSpec(wx.stc.STC_STYLE_BRACELIGHT,'fore:#00009D,back:#FFFF00')
             # Unmatched brace
             # Highlighted brace
             self.StyleSetSpec(wx.stc.STC_STYLE_BRACELIGHT,'fore:#00009D,back:#FFFF00')
             # Unmatched brace


@@ -960,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)


@@ -993,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(22, 22)
-        # 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
     


@@ -1012,14 +1014,19 @@ class DemoTaskBarIcon(wx.TaskBarIcon):
     def OnTaskBarClose(self, evt):
         self.frame.Close()
 
     def OnTaskBarClose(self, evt):
         self.frame.Close()
 

-        # because of the way wx.TaskBarIcon.PopupMenu is implemented we have to
-        # prod the main idle handler a bit to get the window to actually close
-        wx.GetApp().ProcessIdle()
-    

 
     def OnTaskBarChange(self, evt):
 
     def OnTaskBarChange(self, evt):

-        icon = self.MakeIcon(images.getRobinImage())
-        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):


@@ -1042,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)


@@ -1207,6 +1214,9 @@ class wxPythonDemo(wx.Frame):
         #wx.Log_SetTraceMask(wx.TraceMessages)
 
 
         #wx.Log_SetTraceMask(wx.TraceMessages)
 
 

+        self.Bind(wx.EVT_ACTIVATE, self.OnActivate)
+        wx.GetApp().Bind(wx.EVT_ACTIVATE_APP, self.OnAppActivate)
+

         # add the windows to the splitter and split it.
         splitter2.SplitHorizontally(self.nb, self.log, -160)
         splitter.SplitVertically(self.tree, splitter2, 200)
         # add the windows to the splitter and split it.
         splitter2.SplitHorizontally(self.nb, self.log, -160)
         splitter.SplitVertically(self.tree, splitter2, 200)


@@ -1324,9 +1334,8 @@ class wxPythonDemo(wx.Frame):
         self.ShutdownDemoModule()
         overviewText = ""
         
         self.ShutdownDemoModule()
         overviewText = ""
         

-        # o If the demo returns a window it is placed in a tab.
-        # o Otherwise, a placeholder tab is created, informing the user that the
-        #   demo runs outside the main window, and allowing it to be reloaded.
+        # o The RunTest() for all samples must now return a window that can
+        #   be palced in a tab in the main notebook.

         # o If an error occurs (or has occured before) an error tab is created.
         
         if module is not None:
         # o If an error occurs (or has occured before) an error tab is created.
         
         if module is not None:


@@ -1564,7 +1573,7 @@ class wxPythonDemo(wx.Frame):
 
     #---------------------------------------------
     def OnIconfiy(self, evt):
 
     #---------------------------------------------
     def OnIconfiy(self, evt):

-        wx.LogMessage("OnIconfiy: %d" % evt.Iconized())
+        wx.LogMessage("OnIconfiy: %s" % evt.Iconized())

         evt.Skip()
 
     #---------------------------------------------
         evt.Skip()
 
     #---------------------------------------------


@@ -1572,8 +1581,15 @@ class wxPythonDemo(wx.Frame):
         wx.LogMessage("OnMaximize")
         evt.Skip()
 
         wx.LogMessage("OnMaximize")
         evt.Skip()
 

+    #---------------------------------------------
+    def OnActivate(self, evt):
+        wx.LogMessage("OnActivate: %s" % evt.GetActive())
+        evt.Skip()

 
 

-
+    #---------------------------------------------
+    def OnAppActivate(self, evt):
+        wx.LogMessage("OnAppActivate: %s" % evt.GetActive())
+        evt.Skip()

 
 #---------------------------------------------------------------------------
 #---------------------------------------------------------------------------
 
 #---------------------------------------------------------------------------
 #---------------------------------------------------------------------------