X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/67d6c8cb7ea8613efd737c38dd23cd6083cc5800..b0a54b8a6bee82b1e66c92c710918e9b8146097d:/wxPython/demo/Main.py

diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index 748c58060c..37ea20b5fa 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,13 +59,16 @@ _treeList = [
         'FlatNotebook',
         'CustomTreeCtrl',
         'AboutBox',
-        'AnimateCtrl',
         'AlphaDrawing',
         'GraphicsContext',
         'CollapsiblePane',
         'ComboCtrl',
         'OwnerDrawnComboBox',
         'BitmapComboBox',
+        'I18N',
+        'Img2PyArtProvider',
+        'SearchCtrl',
+        'SizedControls',
         ]),
 
     # managed windows == things with a (optional) caption you can close
@@ -130,6 +126,7 @@ _treeList = [
         'RadioButton',
         'SashWindow',
         'ScrolledWindow',
+        'SearchCtrl',        
         'Slider',
         'SpinButton',
         'SpinCtrl',
@@ -226,6 +223,7 @@ _treeList = [
         'Layoutf',
         'RowColSizer',
         'ScrolledPanel',
+        'SizedControls',
         'Sizers',
         'XmlResource',
         'XmlResourceHandler',
@@ -262,6 +260,7 @@ _treeList = [
         'Image',
         'ImageAlpha',
         'ImageFromStream',
+        'Img2PyArtProvider',
         'Mask',
         'RawBitmapAccess',
         'Throbber',
@@ -278,6 +277,7 @@ _treeList = [
         'FontEnumerator',
         'GraphicsContext',
         'GLCanvas',
+        'I18N',        
         'Joystick',
         'MimeTypesManager',
         'MouseGestures',
@@ -997,7 +997,7 @@ class DemoErrorPanel(wx.Panel):
         boxInfoGrid  = wx.FlexGridSizer(0, 2, 0, 0)
         textFlags    = wx.ALIGN_RIGHT | wx.LEFT | wx.RIGHT | wx.TOP
         boxInfoGrid.Add(wx.StaticText(self, -1, "Type: "), 0, textFlags, 5 )
-        boxInfoGrid.Add(wx.StaticText(self, -1, demoError.exception_type) , 0, textFlags, 5 )
+        boxInfoGrid.Add(wx.StaticText(self, -1, str(demoError.exception_type)) , 0, textFlags, 5 )
         boxInfoGrid.Add(wx.StaticText(self, -1, "Details: ") , 0, textFlags, 5 )
         boxInfoGrid.Add(wx.StaticText(self, -1, demoError.exception_details) , 0, textFlags, 5 )
         boxInfoSizer.Add(boxInfoGrid, 0, wx.ALIGN_CENTRE | wx.ALL, 5 )
@@ -1213,7 +1213,7 @@ class wxPythonDemo(wx.Frame):
 
         # 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)
@@ -1772,8 +1772,9 @@ class MySplashScreen(wx.SplashScreen):
         if self.fc.IsRunning():
             self.Raise()
         
+import wx.lib.mixins.inspect
 
-class MyApp(wx.App):
+class MyApp(wx.App, wx.lib.mixins.inspect.InspectionMixin):
     def OnInit(self):
         """
         Create and show the splash screen.  It will then create and show
@@ -1794,6 +1795,9 @@ class MyApp(wx.App):
         splash = MySplashScreen()
         splash.Show()
 
+        # Setup the InspectionMixin
+        self.Init()
+        
         return True