handle returning the cookie for Get[First|Next]Selected like in the treectrl.

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

diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index 884b8ee32c65e2b343ffc866b6b84d0ed1bc9ca0..ba79bc8e44e569b45694afc0eb4e3f10fdc5c753 100644 (file)
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -30,8 +30,9 @@ import images
 
 _treeList = [
     # new stuff
-    ('Recent Additions and Updates', [
+    ('Recent Additions/Updates', [
         'OGL',
+        'FloatCanvas',
         ]),
 
     # managed windows == things with a (optional) caption you can close
@@ -250,7 +251,7 @@ class MyTP(wx.PyTipProvider):
 #
 
 try:
-    ##raise ImportError
+    ##raise ImportError     # for testing the alternate implementation
     from wx import stc
     from StyledTextCtrl_2 import PythonSTC
     class DemoCodeViewer(PythonSTC):
@@ -434,12 +435,9 @@ class wxPythonDemo(wx.Frame):
 
         if wx.Platform != '__WXMAC__':
             # setup a taskbar icon, and catch some events from it
-            if wx.Platform == '__WXGTK__':
-                dimension = 22
-            else:
-                dimension = 16
+            dim = 16  # (may want to use 22 on wxGTK...)
             icon = wx.IconFromBitmap(
-                images.getMondrianImage().Scale(dimension,dimension).ConvertToBitmap() )
+                images.getMondrianImage().Scale(dim,dim).ConvertToBitmap() )
             #icon = wx.Icon('bmp_source/mondrian.ico', wx.BITMAP_TYPE_ICO)
             #icon = images.getMondrianIcon()
             self.tbicon = wx.TaskBarIcon()