A little cleanup

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

diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index 25cd0792779d7badc9d2797fef7544a7dc225347..c951870a3b3752d80b42d9e53c471cb620041a61 100644 (file)
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -49,6 +49,7 @@ _treeList = [
     ('Recent Additions/Updates', [
         'FoldPanelBar',
         'GIFAnimationCtrl',
     ('Recent Additions/Updates', [
         'FoldPanelBar',
         'GIFAnimationCtrl',

+        'HyperLinkCtrl',

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


@@ -156,6 +157,7 @@ _treeList = [
         'FoldPanelBar',
         'GIFAnimationCtrl',
         'HtmlWindow',
         'FoldPanelBar',
         'GIFAnimationCtrl',
         'HtmlWindow',

+        'HyperLinkCtrl',

         'IntCtrl',
         'MediaCtrl',
         'MVCTree',   
         'IntCtrl',
         'MediaCtrl',
         'MVCTree',   


@@ -935,7 +937,7 @@ class DemoErrorPanel(wx.Panel):
         self.box = wx.BoxSizer(wx.VERTICAL)
 
         # Main Label
         self.box = wx.BoxSizer(wx.VERTICAL)
 
         # Main Label

-        self.box.Add(wx.StaticText(self, -1, "An error has occured while trying to run the demo")
+        self.box.Add(wx.StaticText(self, -1, "An error has occurred while trying to run the demo")

                      , 0, wx.ALIGN_CENTER | wx.TOP, 10)
 
         # Exception Information
                      , 0, wx.ALIGN_CENTER | wx.TOP, 10)
 
         # Exception Information


@@ -1078,8 +1080,7 @@ class DemoTaskBarIcon(wx.TaskBarIcon):
 
 
     def OnTaskBarChange(self, evt):
 
 
     def OnTaskBarChange(self, evt):

-        names = [ "WXPdemo", "WXP", "Mondrian", "Test2m",
-                  "Blom08m", "Blom10m", "Blom15m" ]
+        names = [ "WXPdemo", "Mondrian", "Pencil", "Carrot" ]                  

         name = names[self.imgidx]
         
         getFunc = getattr(images, "get%sImage" % name)
         name = names[self.imgidx]
         
         getFunc = getattr(images, "get%sImage" % name)


@@ -1403,7 +1404,7 @@ class wxPythonDemo(wx.Frame):
         
         # o The RunTest() for all samples must now return a window that can
         #   be palced in a tab in the main notebook.
         
         # o The RunTest() for all samples must now return a window that can
         #   be palced in a tab in the main notebook.

-        # o If an error occurs (or has occured before) an error tab is created.
+        # o If an error occurs (or has occurred before) an error tab is created.

         
         if module is not None:
             wx.LogMessage("Running demo module...")
         
         if module is not None:
             wx.LogMessage("Running demo module...")


@@ -1673,18 +1674,33 @@ class wxPythonDemo(wx.Frame):
 
 class MySplashScreen(wx.SplashScreen):
     def __init__(self):
 
 class MySplashScreen(wx.SplashScreen):
     def __init__(self):

-        bmp = wx.Image(opj("bitmaps/splash.gif")).ConvertToBitmap()
+        bmp = wx.Image(opj("bitmaps/splash.png")).ConvertToBitmap()

         wx.SplashScreen.__init__(self, bmp,
                                  wx.SPLASH_CENTRE_ON_SCREEN | wx.SPLASH_TIMEOUT,
         wx.SplashScreen.__init__(self, bmp,
                                  wx.SPLASH_CENTRE_ON_SCREEN | wx.SPLASH_TIMEOUT,

-                                 3000, None, -1)
+                                 5000, None, -1)

         self.Bind(wx.EVT_CLOSE, self.OnClose)
         self.Bind(wx.EVT_CLOSE, self.OnClose)

+        self.fc = wx.FutureCall(2000, self.ShowMain)
+

 
     def OnClose(self, evt):
 
     def OnClose(self, evt):

+        # Make sure the default handler runs too so this window gets
+        # destroyed
+        evt.Skip()

         self.Hide()
         self.Hide()

+        
+        # if the timer is still running then go ahead and show the
+        # main frame now
+        if self.fc.IsRunning():
+            self.fc.Stop()
+            self.ShowMain()
+
+
+    def ShowMain(self):

         frame = wxPythonDemo(None, "wxPython: (A Demonstration)")
         frame.Show()
         frame = wxPythonDemo(None, "wxPython: (A Demonstration)")
         frame.Show()

-        evt.Skip()  # Make sure the default handler runs too...
-
+        if self.fc.IsRunning():
+            self.Raise()
+        

 
 class MyApp(wx.App):
     def OnInit(self):
 
 class MyApp(wx.App):
     def OnInit(self):


@@ -1703,7 +1719,7 @@ class MyApp(wx.App):
         # 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
         # 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 SplashScreen effect.        
+        # ShowMain above) so the users can see the SplashScreen effect.        

         splash = MySplashScreen()
         splash.Show()
 
         splash = MySplashScreen()
         splash.Show()