Fixed OOR typo

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

diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index 9d2d87fd77a537f1327c1cfce465f24c50f2ee94..d57aebbb3662ae8e991a71348b84ca4779674cbf 100644 (file)
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -38,6 +38,10 @@ _treeList = [
         'GridBagSizer',
         'Cursor',
         'PyPlot',
         'GridBagSizer',
         'Cursor',
         'PyPlot',

+        'ImageAlpha',
+        'ActiveX_FlashWindow',
+        'ActiveX_IEHtmlWindow',
+        'ActiveX_PDFWindow',

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


@@ -67,7 +71,7 @@ _treeList = [
 
     # dialogs from libraries
     ('More Dialogs', [
 
     # dialogs from libraries
     ('More Dialogs', [

-        'ErrorDialogs',
+        ##'ErrorDialogs',

         'ImageBrowser',
         'MultipleChoiceDialog',
         'ScrolledMessageDialog',
         'ImageBrowser',
         'MultipleChoiceDialog',
         'ScrolledMessageDialog',


@@ -75,6 +79,7 @@ _treeList = [
 
     # core controls
     ('Core Windows/Controls', [
 
     # core controls
     ('Core Windows/Controls', [

+        'BitmapButton',

         'Button',
         'CheckBox',
         'CheckListBox',
         'Button',
         'CheckBox',
         'CheckListBox',


@@ -124,6 +129,9 @@ _treeList = [
     
     # controls coming from other libraries
     ('More Windows/Controls', [
     
     # controls coming from other libraries
     ('More Windows/Controls', [

+        'ActiveX_FlashWindow',
+        'ActiveX_IEHtmlWindow',
+        'ActiveX_PDFWindow',

         #'RightTextCtrl',     deprecated as we have wxTE_RIGHT now.
         'Calendar',
         'CalendarCtrl',
         #'RightTextCtrl',     deprecated as we have wxTE_RIGHT now.
         'Calendar',
         'CalendarCtrl',


@@ -135,7 +143,7 @@ _treeList = [
         'FloatBar',  
         'FloatCanvas',
         'HtmlWindow',
         'FloatBar',  
         'FloatCanvas',
         'HtmlWindow',

-        'IEHtmlWin',
+        ##'IEHtmlWin',

         'IntCtrl',
         'MVCTree',   
         'MaskedEditControls',
         'IntCtrl',
         'MVCTree',   
         'MaskedEditControls',


@@ -172,7 +180,7 @@ _treeList = [
     ('Process and Events', [
         'EventManager',
         'KeyEvents',
     ('Process and Events', [
         'EventManager',
         'KeyEvents',

-        'OOR',
+        ##'OOR',

         'Process',
         'PythonEvents',
         'Threads',
         'Process',
         'PythonEvents',
         'Threads',


@@ -193,6 +201,7 @@ _treeList = [
         'Cursor',
         'DragImage',
         'Image',
         'Cursor',
         'DragImage',
         'Image',

+        'ImageAlpha',

         'ImageFromStream',
         'Mask',
         'Throbber',
         'ImageFromStream',
         'Mask',
         'Throbber',


@@ -216,8 +225,8 @@ _treeList = [
 
     # need libs not coming with the demo
     ('Objects using an external library', [
 
     # need libs not coming with the demo
     ('Objects using an external library', [

-        'ActiveXWrapper_Acrobat',
-        'ActiveXWrapper_IE',
+        ##'ActiveXWrapper_Acrobat',
+        ##'ActiveXWrapper_IE',      # currently has tstate problems...

         'GLCanvas',
         #'PlotCanvas', # deprecated, use PyPlot
         ]),
         'GLCanvas',
         #'PlotCanvas', # deprecated, use PyPlot
         ]),


@@ -491,9 +500,15 @@ class wxPythonDemo(wx.Frame):
         # Make a File menu
         self.mainmenu = wx.MenuBar()
         menu = wx.Menu()
         # Make a File menu
         self.mainmenu = wx.MenuBar()
         menu = wx.Menu()

+        item = menu.Append(-1, '&Redirect Output',
+                           'Redirect print statements to a window',
+                           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())
         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())

+

         self.mainmenu.Append(menu, '&File')
 
         # Make a Demo menu
         self.mainmenu.Append(menu, '&File')
 
         # Make a Demo menu


@@ -713,6 +728,7 @@ class wxPythonDemo(wx.Frame):
                 self.txt.Clear()
                 self.window = None
 
                 self.txt.Clear()
                 self.window = None
 

+        self.tree.SetFocus()

 
 
     #---------------------------------------------
 
 
     #---------------------------------------------


@@ -741,6 +757,15 @@ class wxPythonDemo(wx.Frame):
     def OnFileExit(self, *event):
         self.Close()
 
     def OnFileExit(self, *event):
         self.Close()
 

+    def OnToggleRedirect(self, event):
+        app = wx.GetApp()
+        if event.Checked():
+            app.RedirectStdio()
+            print "Print statements and other standard output will now be directed to this window."
+        else:
+            app.RestoreStdio()
+            print "Print statements and other standard output will now be sent to the usual location."
+        

     def OnHelpAbout(self, event):
         from About import MyAboutBox
         about = MyAboutBox(self)
     def OnHelpAbout(self, event):
         from About import MyAboutBox
         about = MyAboutBox(self)