X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a5d9c77bb86ba15dd3701b4d6a3539619f89d876..aa154cb1578ba9d44c7e24c5e76d8238bf8809d0:/wxPython/demo/Main.py

diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index 9d2d87fd77..f20cea6235 100644
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -38,6 +38,7 @@ _treeList = [
         'GridBagSizer',
         'Cursor',
         'PyPlot',
+        'ImageAlpha',
         ]),
 
     # managed windows == things with a (optional) caption you can close
@@ -67,7 +68,7 @@ _treeList = [
 
     # dialogs from libraries
     ('More Dialogs', [
-        'ErrorDialogs',
+        ##'ErrorDialogs',
         'ImageBrowser',
         'MultipleChoiceDialog',
         'ScrolledMessageDialog',
@@ -75,6 +76,7 @@ _treeList = [
 
     # core controls
     ('Core Windows/Controls', [
+        'BitmapButton',
         'Button',
         'CheckBox',
         'CheckListBox',
@@ -172,7 +174,7 @@ _treeList = [
     ('Process and Events', [
         'EventManager',
         'KeyEvents',
-        'OOR',
+        ##'OOR',
         'Process',
         'PythonEvents',
         'Threads',
@@ -193,6 +195,7 @@ _treeList = [
         'Cursor',
         'DragImage',
         'Image',
+        'ImageAlpha',
         'ImageFromStream',
         'Mask',
         'Throbber',
@@ -217,7 +220,7 @@ _treeList = [
     # need libs not coming with the demo
     ('Objects using an external library', [
         'ActiveXWrapper_Acrobat',
-        'ActiveXWrapper_IE',
+        ##'ActiveXWrapper_IE',      # currently has tstate problems...
         'GLCanvas',
         #'PlotCanvas', # deprecated, use PyPlot
         ]),
@@ -491,9 +494,15 @@ class wxPythonDemo(wx.Frame):
         # 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())
+
         self.mainmenu.Append(menu, '&File')
 
         # Make a Demo menu
@@ -713,6 +722,7 @@ class wxPythonDemo(wx.Frame):
                 self.txt.Clear()
                 self.window = None
 
+        self.tree.SetFocus()
 
 
     #---------------------------------------------
@@ -741,6 +751,15 @@ class wxPythonDemo(wx.Frame):
     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)