X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b2bacf13e35b54b68ba707894630eff0e36da6b1..547aafd263c13ca3fb86190b01112d20c13c9744:/wxPython/demo/Main.py?ds=sidebyside

diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index f20cea6235..899e4aa563 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,7 +30,7 @@ import images
 
 _treeList = [
     # new stuff
-    ('Recent Additions', [
+    ('Recent Additions and Updates', [
         'VListBox',
         'Listbook',
         'MaskedNumCtrl',
@@ -39,6 +40,9 @@ _treeList = [
         'Cursor',
         'PyPlot',
         'ImageAlpha',
+        'ActiveX_FlashWindow',
+        'ActiveX_IEHtmlWindow',
+        'ActiveX_PDFWindow',
         ]),
 
     # managed windows == things with a (optional) caption you can close
@@ -68,7 +72,6 @@ _treeList = [
 
     # dialogs from libraries
     ('More Dialogs', [
-        ##'ErrorDialogs',
         'ImageBrowser',
         'MultipleChoiceDialog',
         'ScrolledMessageDialog',
@@ -126,6 +129,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',
@@ -137,7 +143,6 @@ _treeList = [
         'FloatBar',  
         'FloatCanvas',
         'HtmlWindow',
-        'IEHtmlWin',
         'IntCtrl',
         'MVCTree',   
         'MaskedEditControls',
@@ -174,7 +179,6 @@ _treeList = [
     ('Process and Events', [
         'EventManager',
         'KeyEvents',
-        ##'OOR',
         'Process',
         'PythonEvents',
         'Threads',
@@ -209,7 +213,6 @@ _treeList = [
         'FileHistory',
         'FontEnumerator',
         'Joystick',
-        'NewNamespace',
         'OGL',
         'PrintFramework',
         'ShapedWindow',
@@ -218,11 +221,8 @@ _treeList = [
         ]),
 
     # need libs not coming with the demo
-    ('Objects using an external library', [
-        'ActiveXWrapper_Acrobat',
-        ##'ActiveXWrapper_IE',      # currently has tstate problems...
+    ('Samples using an external library', [
         'GLCanvas',
-        #'PlotCanvas', # deprecated, use PyPlot
         ]),
 
 
@@ -465,13 +465,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))
 
@@ -635,7 +635,7 @@ class wxPythonDemo(wx.Frame):
                 self.tree.EnsureVisible(selectedDemo)
 
 
-        wx.LogMessage('window handle: %s' % self.GetHandle())
+##        wx.LogMessage('window handle: %s' % self.GetHandle())
 
 
     #---------------------------------------------
@@ -817,8 +817,6 @@ class wxPythonDemo(wx.Frame):
         self.dying = True
         self.window = None
         self.mainmenu = None
-        if hasattr(self, "tbicon"):
-            del self.tbicon
         self.Destroy()
 
 
@@ -923,14 +921,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()