r13129 - /branches/gui_testing/gui/wizard.py -- June 20, 2011 - 18:53

Author: bugman
Date: Mon Jun 20 18:53:49 2011
New Revision: 13129

URL: http://svn.gna.org/viewcvs/relax?rev=13129&view=rev
Log:
Fixes for how wizard pages are displayed sequentially.

This is now functional.


Modified:
    branches/gui_testing/gui/wizard.py

Modified: branches/gui_testing/gui/wizard.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/wizard.py?rev=13129&r1=13128&r2=13129&view=diff
==============================================================================
--- branches/gui_testing/gui/wizard.py (original)
+++ branches/gui_testing/gui/wizard.py Mon Jun 20 18:53:49 2011
@@ -712,6 +712,7 @@
         self.Centre()
 
         # Initialise the page storage.
+        self.current_page = 0
         self.pages = []
         self.page_sizers = []
         self.button_sizers = []
@@ -843,8 +844,8 @@
         for j in range(len(self.pages)):
             self.main_sizer.Hide(self.page_sizers[j])
 
-        # Add the page.
-        self.main_sizer.Add(self.page_sizers[i], 1, wx.ALL|wx.EXPAND, 0)
+        # Show the desired page.
+        self.main_sizer.Show(self.page_sizers[i])
 
         # Re-perform the window layout.
         self.Layout()
@@ -885,16 +886,11 @@
         # Build the buttons for the entire wizard.
         self.build_buttons()
 
+        # Display the first page.
+        self.display_page(0)
+
         # Show the wizard.
         self.ShowModal()
 
-        # Loop over the pages.
-        for i in range(len(self.pages)):
-            # Store the current page.
-            self.current_page = i
-
-            # Display the page.
-            self.display_page(i)
-
         # Destroy the wizard.
         self.Destroy()