X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/84bc0d49e411fd74ddac8b13318fc2edfba9258a..bcf4fef28832e4c3d38a5bd4be253ed7101631f8:/wxPython/demo/Main.py

diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index 856b88c575..bbb6a43cca 100644
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -71,6 +71,11 @@ _treeList = [
         'GraphicsContext',
         'CollapsiblePane',
         'ComboCtrl',
+        'OwnerDrawnComboBox',
+        'BitmapComboBox',
+        'I18N',
+        'Img2PyArtProvider',
+        'SearchCtrl',        
         ]),
 
     # managed windows == things with a (optional) caption you can close
@@ -114,7 +119,6 @@ _treeList = [
         'CheckListBox',
         'Choice',
         'ComboBox',
-        'ComboCtrl',
         'Gauge',
         'Grid',
         'Grid_MegaExample',
@@ -129,6 +133,7 @@ _treeList = [
         'RadioButton',
         'SashWindow',
         'ScrolledWindow',
+        'SearchCtrl',        
         'Slider',
         'SpinButton',
         'SpinCtrl',
@@ -176,7 +181,7 @@ _treeList = [
         'ActiveX_FlashWindow',
         'ActiveX_IEHtmlWindow',
         'ActiveX_PDFWindow',
-        #'RightTextCtrl',     deprecated as we have wxTE_RIGHT now.
+        'BitmapComboBox',
         'Calendar',
         'CalendarCtrl',
         'CheckListCtrlMixin',
@@ -200,6 +205,7 @@ _treeList = [
         'MaskedNumCtrl',
         'MediaCtrl',
         'MultiSplitterWindow',
+        'OwnerDrawnComboBox',
         'Pickers',
         'PyCrust',
         'PyPlot',
@@ -260,6 +266,7 @@ _treeList = [
         'Image',
         'ImageAlpha',
         'ImageFromStream',
+        'Img2PyArtProvider',
         'Mask',
         'RawBitmapAccess',
         'Throbber',
@@ -276,6 +283,7 @@ _treeList = [
         'FontEnumerator',
         'GraphicsContext',
         'GLCanvas',
+        'I18N',        
         'Joystick',
         'MimeTypesManager',
         'MouseGestures',
@@ -995,7 +1003,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 )
@@ -1211,7 +1219,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)
@@ -1303,6 +1311,8 @@ class wxPythonDemo(wx.Frame):
         # Set up a log window
         self.log = wx.TextCtrl(splitter2, -1,
                               style = wx.TE_MULTILINE|wx.TE_READONLY|wx.HSCROLL)
+        if wx.Platform == "__WXMAC__":
+            self.log.MacCheckSpelling(False)
 
         # Set the wxWindows log target to be this textctrl
         #wx.Log_SetActiveTarget(wx.LogTextCtrl(self.log))
@@ -1367,7 +1377,7 @@ class wxPythonDemo(wx.Frame):
         filter = self.filter.GetValue()
         for category, items in _treeList:
             if filter:
-                items = [item for item in items if filter in item.lower()]
+                items = [item for item in items if filter.lower() in item.lower()]
             if items:
                 child = self.tree.AppendItem(self.root, category)
                 if not firstChild: firstChild = child
@@ -1768,8 +1778,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
@@ -1790,6 +1801,9 @@ class MyApp(wx.App):
         splash = MySplashScreen()
         splash.Show()
 
+        # Setup the InspectionMixin
+        self.Init()
+        
         return True