X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8a88769e50fcf3c538498f6fecdd2d0c7abca6ec..96aecfc900cf46a37eda895860314c494290af19:/wxPython/demo/Main.py?ds=sidebyside

diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index 6a2146104b..884b8ee32c 100644
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -20,8 +20,9 @@ import images
 
 # For debugging
 ##wx.Trap();
+##print "wx.VERSION_STRING = ", wx.VERSION_STRING
 ##print os.getpid();
-##raw_input("Press a key...")
+##raw_input("Press Enter...")
 
 
 #---------------------------------------------------------------------------
@@ -29,16 +30,8 @@ import images
 
 _treeList = [
     # new stuff
-    ('Recent Additions', [
-        'VListBox',
-        'Listbook',
-        'MaskedNumCtrl',
-        'FloatCanvas',
-        'XmlResourceSubclass',
-        'GridBagSizer',
-        'Cursor',
-        'PyPlot',
-        'ImageAlpha',
+    ('Recent Additions and Updates', [
+        'OGL',
         ]),
 
     # managed windows == things with a (optional) caption you can close
@@ -68,7 +61,6 @@ _treeList = [
 
     # dialogs from libraries
     ('More Dialogs', [
-        'ErrorDialogs',
         'ImageBrowser',
         'MultipleChoiceDialog',
         'ScrolledMessageDialog',
@@ -76,6 +68,7 @@ _treeList = [
 
     # core controls
     ('Core Windows/Controls', [
+        'BitmapButton',
         'Button',
         'CheckBox',
         'CheckListBox',
@@ -125,6 +118,9 @@ _treeList = [
     
     # controls coming from other libraries
     ('More Windows/Controls', [
+        'ActiveX_FlashWindow',
+        'ActiveX_IEHtmlWindow',
+        'ActiveX_PDFWindow',
         #'RightTextCtrl',     deprecated as we have wxTE_RIGHT now.
         'Calendar',
         'CalendarCtrl',
@@ -136,7 +132,6 @@ _treeList = [
         'FloatBar',  
         'FloatCanvas',
         'HtmlWindow',
-        'IEHtmlWin',
         'IntCtrl',
         'MVCTree',   
         'MaskedEditControls',
@@ -173,7 +168,6 @@ _treeList = [
     ('Process and Events', [
         'EventManager',
         'KeyEvents',
-        'OOR',
         'Process',
         'PythonEvents',
         'Threads',
@@ -208,7 +202,6 @@ _treeList = [
         'FileHistory',
         'FontEnumerator',
         'Joystick',
-        'NewNamespace',
         'OGL',
         'PrintFramework',
         'ShapedWindow',
@@ -217,11 +210,8 @@ _treeList = [
         ]),
 
     # need libs not coming with the demo
-    ('Objects using an external library', [
-        'ActiveXWrapper_Acrobat',
-        'ActiveXWrapper_IE',
+    ('Samples using an external library', [
         'GLCanvas',
-        #'PlotCanvas', # deprecated, use PyPlot
         ]),
 
 
@@ -444,8 +434,14 @@ class wxPythonDemo(wx.Frame):
 
         if wx.Platform != '__WXMAC__':
             # setup a taskbar icon, and catch some events from it
+            if wx.Platform == '__WXGTK__':
+                dimension = 22
+            else:
+                dimension = 16
             icon = wx.IconFromBitmap(
-                images.getMondrianImage().Scale(16,16).ConvertToBitmap() )            
+                images.getMondrianImage().Scale(dimension,dimension).ConvertToBitmap() )
+            #icon = wx.Icon('bmp_source/mondrian.ico', wx.BITMAP_TYPE_ICO)
+            #icon = images.getMondrianIcon()
             self.tbicon = wx.TaskBarIcon()
             self.tbicon.SetIcon(icon, "wxPython Demo")
             self.tbicon.Bind(wx.EVT_TASKBAR_LEFT_DCLICK, self.OnTaskBarActivate)
@@ -464,13 +460,13 @@ class wxPythonDemo(wx.Frame):
         self.Centre(wx.BOTH)
         self.CreateStatusBar(1, wx.ST_SIZEGRIP)
 
-        splitter = wx.SplitterWindow(self, -1)
-        splitter2 = wx.SplitterWindow(splitter, -1) ##, size=(20,20))
+        splitter = wx.SplitterWindow(self, -1, style=wx.CLIP_CHILDREN | wx.SP_LIVE_UPDATE | wx.SP_3D)
+        splitter2 = wx.SplitterWindow(splitter, -1, style=wx.CLIP_CHILDREN | wx.SP_LIVE_UPDATE | wx.SP_3D)
 
         # Set up a log on the View Log Notebook page
         self.log = wx.TextCtrl(splitter2, -1,
                               style = wx.TE_MULTILINE|wx.TE_READONLY|wx.HSCROLL)
-
+        
         # Set the wxWindows log target to be this textctrl
         #wx.Log_SetActiveTarget(wx.LogTextCtrl(self.log))
 
@@ -493,9 +489,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
@@ -628,7 +630,7 @@ class wxPythonDemo(wx.Frame):
                 self.tree.EnsureVisible(selectedDemo)
 
 
-        wx.LogMessage('window handle: %s' % self.GetHandle())
+##        wx.LogMessage('window handle: %s' % self.GetHandle())
 
 
     #---------------------------------------------
@@ -715,6 +717,7 @@ class wxPythonDemo(wx.Frame):
                 self.txt.Clear()
                 self.window = None
 
+        self.tree.SetFocus()
 
 
     #---------------------------------------------
@@ -743,6 +746,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)
@@ -800,8 +812,6 @@ class wxPythonDemo(wx.Frame):
         self.dying = True
         self.window = None
         self.mainmenu = None
-        if hasattr(self, "tbicon"):
-            del self.tbicon
         self.Destroy()
 
 
@@ -906,14 +916,12 @@ class MyApp(wx.App):
         the main frame when it is time to do so.
         """
 
-        wx.InitAllImageHandlers()
-
         # Normally when using a SplashScreen you would create it, show
         # it and then continue on with the applicaiton's
         # initialization, finally creating and showing the main
         # application window(s).  In this case we have nothing else to
         # do so we'll delay showing the main frame until later (see
-        # OnClose above) so the users can see the SplashScrren effect.        
+        # OnClose above) so the users can see the SplashScreen effect.        
         splash = MySplashScreen()
         splash.Show()
 
@@ -940,13 +948,12 @@ def main():
 overview = """<html><body>
 <h2>wxPython</h2>
 
-<p> wxPython is a <b>GUI toolkit</b> for the <a
-href="http://www.python.org/">Python</a> programming language.  It
-allows Python programmers to create programs with a robust, highly
-functional graphical user interface, simply and easily.  It is
-implemented as a Python extension module (native code) that wraps the
-popular <a href="http://wxwindows.org/front.htm">wxWindows</a> cross
-platform GUI library, which is written in C++.
+<p> wxPython is a <b>GUI toolkit</b> for the Python programming
+language.  It allows Python programmers to create programs with a
+robust, highly functional graphical user interface, simply and easily.
+It is implemented as a Python extension module (native code) that
+wraps the popular wxWindows cross platform GUI library, which is
+written in C++.
 
 <p> Like Python and wxWindows, wxPython is <b>Open Source</b> which
 means that it is free for anyone to use and the source code is