Another package name fix

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

diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index 784878f3ce00cb01be4eed6c78c6fce3f9e0b490..ba1b09105990a63f781ef77945dc93f66f9e3427 100644 (file)
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -70,6 +70,9 @@ _treeList = [
         'AlphaDrawing',
         'GraphicsContext',
         'CollapsiblePane',
         'AlphaDrawing',
         'GraphicsContext',
         'CollapsiblePane',

+        'ComboCtrl',
+        'OwnerDrawnComboBox',
+        'BitmapComboBox',

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


@@ -174,11 +177,12 @@ _treeList = [
         'ActiveX_FlashWindow',
         'ActiveX_IEHtmlWindow',
         'ActiveX_PDFWindow',
         'ActiveX_FlashWindow',
         'ActiveX_IEHtmlWindow',
         'ActiveX_PDFWindow',

-        #'RightTextCtrl',     deprecated as we have wxTE_RIGHT now.
+        'BitmapComboBox',

         'Calendar',
         'CalendarCtrl',
         'CheckListCtrlMixin',
         'CollapsiblePane',
         'Calendar',
         'CalendarCtrl',
         'CheckListCtrlMixin',
         'CollapsiblePane',

+        'ComboCtrl',

         'ContextHelp',
         'DatePickerCtrl',
         'DynamicSashWindow',
         'ContextHelp',
         'DatePickerCtrl',
         'DynamicSashWindow',


@@ -197,6 +201,7 @@ _treeList = [
         'MaskedNumCtrl',
         'MediaCtrl',
         'MultiSplitterWindow',
         'MaskedNumCtrl',
         'MediaCtrl',
         'MultiSplitterWindow',

+        'OwnerDrawnComboBox',

         'Pickers',
         'PyCrust',
         'PyPlot',
         'Pickers',
         'PyCrust',
         'PyPlot',


@@ -1300,6 +1305,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)
         # 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))
 
         # Set the wxWindows log target to be this textctrl
         #wx.Log_SetActiveTarget(wx.LogTextCtrl(self.log))


@@ -1364,7 +1371,7 @@ class wxPythonDemo(wx.Frame):
         filter = self.filter.GetValue()
         for category, items in _treeList:
             if filter:
         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
             if items:
                 child = self.tree.AppendItem(self.root, category)
                 if not firstChild: firstChild = child


@@ -1765,8 +1772,9 @@ class MySplashScreen(wx.SplashScreen):
         if self.fc.IsRunning():
             self.Raise()
         
         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
     def OnInit(self):
         """
         Create and show the splash screen.  It will then create and show


@@ -1787,6 +1795,9 @@ class MyApp(wx.App):
         splash = MySplashScreen()
         splash.Show()
 
         splash = MySplashScreen()
         splash.Show()
 

+        # Setup the InspectionMixin
+        self.Init()
+        

         return True
 
 
         return True