fixed warnings about double to int conversions, defined PI as a constant, untabbed

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

diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index a6f8cdae429ccb86eeafefc9590ce04acf6f64a0..b3ff2f716f255330df932c80baf375ea7a3d1480 100644 (file)
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -480,24 +480,19 @@ class wxPythonDemo(wxFrame):
 #---------------------------------------------------------------------------
 #---------------------------------------------------------------------------
 
-class MyApp(wxApp):
-    def OnInit(self):
-        wxInitAllImageHandlers()
-
-        self.splash = SplashScreen(None, bitmapfile='bitmaps/splash.gif',
-                                   duration=4000, callback=self.AfterSplash)
-        self.splash.Show(true)
-        wxYield()
-        return true
-
-
-    def AfterSplash(self):
-        self.splash.Close(true)
+class MySplashScreen(wxSplashScreen):
+    def __init__(self):
+        bmp = wxImage('bitmaps/splash.gif').ConvertToBitmap()
+        wxSplashScreen.__init__(self, bmp,
+                                wxSPLASH_CENTRE_ON_SCREEN|wxSPLASH_TIMEOUT,
+                                4000, None, -1)
+        EVT_CLOSE(self, self.OnClose)
+
+    def OnClose(self, evt):
         frame = wxPythonDemo(None, -1, "wxPython: (A Demonstration)")
         frame.Show(true)
-        self.SetTopWindow(frame)
         self.ShowTip(frame)
-
+        evt.Skip()
 
     def ShowTip(self, frame):
         try:
@@ -505,7 +500,6 @@ class MyApp(wxApp):
             showTip, index = eval(showTipText)
         except IOError:
             showTip, index = (1, 0)
-        #print showTip, index
         if showTip:
             tp = wxCreateFileTipProvider("data/tips.txt", index)
             showTip = wxShowTip(frame, tp)
@@ -513,6 +507,21 @@ class MyApp(wxApp):
             open("data/showTips", "w").write(str( (showTip, index) ))
 
 
+
+class MyApp(wxApp):
+    def OnInit(self):
+        """
+        Create and show the splash screen.  It will then create and show 
+        the main frame when it is time to do so.
+        """
+        wxInitAllImageHandlers()
+        splash = MySplashScreen()
+        splash.Show()
+        wxYield()
+        return true
+
+
+
 #---------------------------------------------------------------------------
 
 def main():