← Back to branch summary

~ubuntu-branches/ubuntu/maverick/wxwidgets2.8/maverick-proposed

« back to all changes in this revision

Viewing changes to wxPython/demo/Wizard.py

  • Committer: Bazaar Package Importer
  • Author(s): Devid Filoni
  • Date: 2008-06-30 22:02:17 UTC
  • mfrom: (1.1.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20080630220217-vag3tkfp91t0453d
Tags: 2.8.8.0-0ubuntu1
https://launchpad.net/bugs/244355
https://launchpad.net/bugs/242164
https://launchpad.net/bugs/211553
https://launchpad.net/bugs/236876
* New upstream version, based on the upstream tarball
  wxPython-src-2.8.8.0.tar.bz2, remove upstream debian dir (LP: #244355).
* Add debian/watch file, LP: #242164.
* Edit get-orig-source target to provide a .orig.tar.gz with the same md5 for
  each .orig.tar.gz generated.
* debian/rules: remove get-orig-source from .PHONY target.
* debian/control.in: add python-wxtools in python-wxgtk=V=U Suggests field.
* Do not apply fix_from_upstream_svn_r52465 patch, not needed.
* Regenerate octave_oct, tcl_tk_tcl patches for the new version.
* Fix spelling-error-in-description lintian warning.
* Fix depends-on-obsolete-package lintian error.
* Fix executable-not-elf-or-script lintian warnings.
* Fix script-not-executable lintian warnings.
* Fix missing-dependency-on-libc lintian error.
* Fix dbg-package-missing-depends lintian warnings.
* Fix package-contains-empty-directory lintian warnings.
* Fix manpage-has-errors-from-man lintian warning.
* Fix image-file-in-usr-lib lintian warnings:
  - add editra_pixmaps patch
  - add xrced_bitmaps patch
* Fix unused-override lintian info.
* Fix malformed-override lintian errors.
* Fix extra-license-file lintian warnings.
* Install upstream wx.pth instead of generated file links (LP: #211553).
* Add editra.png, pyshell.png (encoded using uuencode) icons, LP: #236876:
  - debian/rules: use uudecode to decode .png icons.
* Add a new pyshell.xpm icon.
* Fix doc-base-file-references-missing-file lintian error.
* Fix doc-base-unknown-section lintian warning.
* Fix ruby-script-but-no-ruby-dep lintian errors.
* Fix wish-script-but-no-wish-dep lintian errors.
* Fix missing-dep-for-interpreter errors.
* Bump Standards-Version to 3.8.0.

Show diffs side-by-side

added added

removed removed

Lines of Context:
wxPython/demo/Wizard.py
88
88
        # contents of the wizard, or need to also change the
89
89
        # next/prev order then it can be done by overriding
90
90
        # GetBitmap.
91
 
        return images.getWizTest2Bitmap()
 
91
        return images.WizTest2.GetBitmap()
92
92
 
93
93
#----------------------------------------------------------------------
94
94
 
145
145
 
146
146
    def OnRunSimpleWizard(self, evt):
147
147
        # Create the wizard and the pages
148
 
        wizard = wiz.Wizard(self, -1, "Simple Wizard", images.getWizTest1Bitmap())
 
148
        wizard = wiz.Wizard(self, -1, "Simple Wizard", images.WizTest1.GetBitmap())
149
149
        page1 = TitledPage(wizard, "Page 1")
150
150
        page2 = TitledPage(wizard, "Page 2")
151
151
        page3 = TitledPage(wizard, "Page 3")
178
178
        #wizard = wx.PreWizard()
179
179
        #wizard.SetExtraStyle(wx.WIZARD_EX_HELPBUTTON)
180
180
        #wizard.Create(self, self.ID_wiz, "Simple Wizard",
181
 
        #              images.getWizTest1Bitmap())
182
 
        wizard = wiz.Wizard(self, -1, "Dynamic Wizard", images.getWizTest1Bitmap())
 
181
        #              images.WizTest1.GetBitmap())
 
182
        wizard = wiz.Wizard(self, -1, "Dynamic Wizard", images.WizTest1.GetBitmap())
183
183
 
184
184
        page1 = TitledPage(wizard, "Page 1")
185
185
        page2 = SkipNextPage(wizard, "Page 2")