← Back to branch summary

~ubuntu-branches/ubuntu/raring/wxwidgets2.8/raring

« back to all changes in this revision

Viewing changes to wxPython/demo/Main.py

  • Committer: Package Import Robot
  • Author(s): Stéphane Graber
  • Date: 2012-01-07 13:59:25 UTC
  • mfrom: (1.1.9) (5.1.10 sid)
  • Revision ID: package-import@ubuntu.com-20120107135925-2601miy9ullcon9j
Tags: 2.8.12.1-6ubuntu1
https://launchpad.net/bugs/632984
* Resync from Debian, changes that were kept:
  - debian/rules: re-enable mediactrl. This allows libwx_gtk2u_media-2.8 to be
    built, as this is required by some applications (LP: #632984)
  - debian/control: Build-dep on libxt-dev for mediactrl.
  - Patches
    + fix-bashism-in-example
* Add conflict on python-wxgtk2.8 (<< 2.8.12.1-6ubuntu1~) to python-wxversion
  to guarantee upgrade ordering when moving from pycentral to dh_python2.

Show diffs side-by-side

added added

removed removed

Lines of Context:
wxPython/demo/Main.py
6
6
# Author:       Robin Dunn
7
7
#
8
8
# Created:      A long time ago, in a galaxy far, far away...
9
 
# RCS-ID:       $Id: Main.py 63794 2010-03-30 04:03:07Z RD $
 
9
# RCS-ID:       $Id: Main.py 67536 2011-04-18 21:00:07Z RD $
10
10
# Copyright:    (c) 1999 by Total Control Software
11
11
# Licence:      wxWindows license
12
12
#----------------------------------------------------------------------------
114
114
        'Cairo_Snippets',
115
115
        'SystemSettings',
116
116
        'GridLabelRenderer',
 
117
        'ItemsPicker',
117
118
        ]),
118
119
 
119
120
    # managed windows == things with a (optional) caption you can close
207
208
        'Editor',
208
209
        'GenericButtons',
209
210
        'GenericDirCtrl',
 
211
        'ItemsPicker',
210
212
        'LEDNumberCtrl',
211
213
        'MultiSash',
212
214
        'PlateButton',