X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3f7f284d555df50912037296c5d74a2911975bce..cfbf301d7cd079bf5d25b3c10a8f0980c397724c:/wxPython/demo/Main.py

diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index d0b5f24017..014213c5f9 100644
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -47,13 +47,6 @@ import images
 _treeList = [
     # new stuff
     ('Recent Additions/Updates', [
-        'AnalogClock',
-        'AUI_DockingWindowMgr',
-        'AUI_Notebook',
-        'CheckListCtrlMixin',
-        'ComboTreeBox',
-        'Pickers',
-        'PseudoDC',
         'RichTextCtrl',
         'Treebook',
         'Toolbook',
@@ -66,7 +59,6 @@ _treeList = [
         'FlatNotebook',
         'CustomTreeCtrl',
         'AboutBox',
-        'AnimateCtrl',
         'AlphaDrawing',
         'GraphicsContext',
         'CollapsiblePane',
@@ -75,12 +67,15 @@ _treeList = [
         'BitmapComboBox',
         'I18N',
         'Img2PyArtProvider',
-        'SearchCtrl',        
+        'SearchCtrl',
+        'SizedControls',
+        'AUI_MDI',
         ]),
 
     # managed windows == things with a (optional) caption you can close
     ('Frames and Dialogs', [
         'AUI_DockingWindowMgr',
+        'AUI_MDI',
         'Dialog',
         'Frame',
         'MDIWindows',
@@ -230,6 +225,7 @@ _treeList = [
         'Layoutf',
         'RowColSizer',
         'ScrolledPanel',
+        'SizedControls',
         'Sizers',
         'XmlResource',
         'XmlResourceHandler',
@@ -1212,14 +1208,14 @@ class wxPythonDemo(wx.Frame):
                            wx.ITEM_CHECK)
         self.Bind(wx.EVT_MENU, self.OnToggleRedirect, 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())
+        exitItem = menu.Append(-1, 'E&xit\tAlt-X', 'Get the heck outta here!')
+        self.Bind(wx.EVT_MENU, self.OnFileExit, exitItem)
+        wx.App.SetMacExitMenuItemId(exitItem.GetId())
         self.mainmenu.Append(menu, '&File')
 
         # Make a Demo menu
         menu = wx.Menu()
-        for item in _treeList:
+        for item in _treeList[:-1]:
             submenu = wx.Menu()
             for childItem in item[1]:
                 mi = submenu.Append(-1, childItem)
@@ -1255,13 +1251,14 @@ class wxPythonDemo(wx.Frame):
         self.finddata = wx.FindReplaceData()
         self.finddata.SetFlags(wx.FR_DOWN)
 
-        if 0:
+        if False:
             # This is another way to set Accelerators, in addition to
             # using the '\t<key>' syntax in the menu items.
-            aTable = wx.AcceleratorTable([(wx.ACCEL_ALT,  ord('X'), exitID),
-                                          (wx.ACCEL_CTRL, ord('H'), helpID),
-                                          (wx.ACCEL_CTRL, ord('F'), findID),
-                                          (wx.ACCEL_NORMAL, WXK_F3, findnextID)
+            aTable = wx.AcceleratorTable([(wx.ACCEL_ALT,  ord('X'), exitItem.GetId()),
+                                          (wx.ACCEL_CTRL, ord('H'), helpItem.GetId()),
+                                          (wx.ACCEL_CTRL, ord('F'), findItem.GetId()),
+                                          (wx.ACCEL_NORMAL, wx.WXK_F3, findnextItem.GetId()),
+                                          (wx.ACCEL_NORMAL, wx.WXK_F9, shellItem.GetId()),
                                           ])
             self.SetAcceleratorTable(aTable)
 
@@ -1270,8 +1267,11 @@ class wxPythonDemo(wx.Frame):
         tID = wx.NewId()
         leftPanel = wx.Panel(splitter)
         
-        self.filter = wx.TextCtrl(leftPanel)
+        self.filter = wx.SearchCtrl(leftPanel)
+        self.filter.ShowCancelButton(True)
         self.filter.Bind(wx.EVT_TEXT, self.RecreateTree)
+        self.filter.Bind(wx.EVT_SEARCHCTRL_CANCEL_BTN,
+                         lambda e: self.filter.SetValue(''))
         
         self.treeMap = {}
         self.tree = wx.TreeCtrl(leftPanel, tID, style =
@@ -1388,7 +1388,8 @@ class wxPythonDemo(wx.Frame):
         self.tree.Expand(self.root)
         if firstChild:
             self.tree.Expand(firstChild)
-
+        if filter:
+            self.tree.ExpandAll()
     
     def WriteText(self, text):
         if text[-1:] == '\n':