[gnue] r8586 - in trunk/gnue-forms/src/uidrivers/wx26: . widgets

[johannes]

Author: johannes
Date: 2006-08-22 03:53:59 -0500 (Tue, 22 Aug 2006)
New Revision: 8586

Modified:
   trunk/gnue-forms/src/uidrivers/wx26/UIdriver.py
   trunk/gnue-forms/src/uidrivers/wx26/widgets/form.py
Log:
Hide the splash screen outside the mainloop


Modified: trunk/gnue-forms/src/uidrivers/wx26/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/UIdriver.py     2006-08-22 08:50:41 UTC 
(rev 8585)
+++ trunk/gnue-forms/src/uidrivers/wx26/UIdriver.py     2006-08-22 08:53:59 UTC 
(rev 8586)
@@ -178,26 +178,37 @@
 
 
   # ---------------------------------------------------------------------------
+  # Hide the splash screen
+  # ---------------------------------------------------------------------------
+
+  def hide_splash(self):
+      """
+      Hide the Splash-Screen (if it is visible).
+      """
+
+      if self.__splash is not None:
+          self.__splash.Close ()
+
+
+  # ---------------------------------------------------------------------------
   # Start the application's main loop
   # ---------------------------------------------------------------------------
 
   def mainLoop (self):
-    """
-    Start the main loop of the current application instance (wx.App ())
-    """
+      """
+      Start the main loop of the current application instance (wx.App ())
+      """
 
-    assert gEnter (6)
+      assert gEnter (6)
 
-    if self.__splash is not None:
-      self.__splash.Close ()
+      # Main loop might already be running if this has been called with
+      # runForm()
+      if not self.app.IsMainLoopRunning():
+          self.app.MainLoop ()
 
-    # Main loop might already be running if this has been called with runForm()
-    if not self.app.IsMainLoopRunning():
-        self.app.MainLoop ()
+      assert gLeave (6)
 
-    assert gLeave (6)
 
-
   # ---------------------------------------------------------------------------
   # Clipboard routines
   # ---------------------------------------------------------------------------

Modified: trunk/gnue-forms/src/uidrivers/wx26/widgets/form.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/widgets/form.py 2006-08-22 08:50:41 UTC 
(rev 8585)
+++ trunk/gnue-forms/src/uidrivers/wx26/widgets/form.py 2006-08-22 08:53:59 UTC 
(rev 8586)
@@ -199,7 +199,9 @@
         self.sizing_enabled = True
         self.main_window.Show ()
 
+        self._uiDriver.hide_splash()
 
+
     # -------------------------------------------------------------------------
     # Show the form/dialog modal
     # -------------------------------------------------------------------------
@@ -211,6 +213,7 @@
         shows the window.
         """
 
+        self._uiDriver.hide_splash()
         self.main_window.Raise()
         self.sizing_enabled = True