← Back to branch summary

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

« back to all changes in this revision

Viewing changes to wxPython/wx/tools/Editra/src/eclib/encdlg.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/wx/tools/Editra/src/eclib/encdlg.py
18
18
"""
19
19
 
20
20
__author__ = "Cody Precord <cprecord@editra.org>"
21
 
__svnid__ = "$Id: encdlg.py 59552 2009-03-15 06:31:10Z CJP $"
22
 
__revision__ = "$Revision: 59552 $"
 
21
__svnid__ = "$Id: encdlg.py 65202 2010-08-06 15:49:23Z CJP $"
 
22
__revision__ = "$Revision: 65202 $"
23
23
 
24
24
__all__ = ['EncodingDialog', 'GetAllEncodings']
25
25
 
64
64
        else:
65
65
            sel = locale.getpreferredencoding(False)
66
66
 
67
 
        choicedlg.ChoiceDialog.__init__(self, parent, id, msg, title,
68
 
                                        elist, sel, pos, size, style)
 
67
        super(EncodingDialog, self).__init__(parent, id, msg, title,
 
68
                                             elist, sel, pos, size, style)
69
69
 
70
70
    def GetEncoding(self):
71
71
        """Get the selected encoding
89
89
    return elist
90
90
 
91
91
#--------------------------------------------------------------------------#
92
 
 
93
 
# Test
94
 
if __name__ == '__main__':
95
 
    app = wx.App(False)
96
 
    dlg = EncodingDialog(None, msg="Choose an Encoding",
97
 
                         title="Encodings", default="utf-8")
98
 
    dlg.ShowModal()
99
 
    print dlg, dlg.GetEncoding()