applying patch 1622389, fixing two memory leaks

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

diff --git a/wxPython/demo/Wizard.py b/wxPython/demo/Wizard.py
index 4ea5dbcc42b75549e718b4e0c31bd6d17ebe77b8..233f172d86b43a288a0486bab685c104a44b8428 100644 (file)
--- a/wxPython/demo/Wizard.py
+++ b/wxPython/demo/Wizard.py
@@ -136,6 +136,7 @@ class TestPanel(wx.Panel):
             wx.MessageBox("Cancelling on the first page has been prevented.", "Sorry")
             evt.Veto()
 
             wx.MessageBox("Cancelling on the first page has been prevented.", "Sorry")
             evt.Veto()
 

+

     def OnWizFinished(self, evt):
         self.log.write("OnWizFinished\n")
         
     def OnWizFinished(self, evt):
         self.log.write("OnWizFinished\n")
         


@@ -162,6 +163,7 @@ wxWizardPageSimple class can easily be used for the pages."""))
         wiz.WizardPageSimple_Chain(page2, page3)
         wiz.WizardPageSimple_Chain(page3, page4)
 
         wiz.WizardPageSimple_Chain(page2, page3)
         wiz.WizardPageSimple_Chain(page3, page4)
 

+        wizard.GetPageAreaSizer().Add(page1)

         if wizard.RunWizard(page1):
             wx.MessageBox("Wizard completed successfully", "That's all folks!")
         else:
         if wizard.RunWizard(page1):
             wx.MessageBox("Wizard completed successfully", "That's all folks!")
         else:


@@ -175,7 +177,7 @@ wxWizardPageSimple class can easily be used for the pages."""))
         #wizard.SetExtraStyle(wx.WIZARD_EX_HELPBUTTON)
         #wizard.Create(self, self.ID_wiz, "Simple Wizard",
         #              images.getWizTest1Bitmap())
         #wizard.SetExtraStyle(wx.WIZARD_EX_HELPBUTTON)
         #wizard.Create(self, self.ID_wiz, "Simple Wizard",
         #              images.getWizTest1Bitmap())

-        wizard = wiz.Wizard(self, -1, "Simple Wizard", images.getWizTest1Bitmap())
+        wizard = wiz.Wizard(self, -1, "Dynamic Wizard", images.getWizTest1Bitmap())

 
         page1 = TitledPage(wizard, "Page 1")
         page2 = SkipNextPage(wizard, "Page 2")
 
         page1 = TitledPage(wizard, "Page 1")
         page2 = SkipNextPage(wizard, "Page 2")


@@ -202,6 +204,7 @@ of the pages and also which bitmap is shown.
         page5.SetPrev(page4)
 
 
         page5.SetPrev(page4)
 
 

+        wizard.GetPageAreaSizer().Add(page1)

         if wizard.RunWizard(page1):
             wx.MessageBox("Wizard completed successfully", "That's all folks!")
         else:
         if wizard.RunWizard(page1):
             wx.MessageBox("Wizard completed successfully", "That's all folks!")
         else: