← 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/syntax/_tcl.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/syntax/_tcl.py
14
14
"""
15
15
 
16
16
__author__ = "Cody Precord <cprecord@editra.org>"
17
 
__svnid__ = "$Id: _tcl.py 63834 2010-04-03 06:04:33Z CJP $"
18
 
__revision__ = "$Revision: 63834 $"
 
17
__svnid__ = "$Id: _tcl.py 64493 2010-06-05 21:25:30Z CJP $"
 
18
__revision__ = "$Revision: 64493 $"
19
19
 
20
20
#-----------------------------------------------------------------------------#
21
21
# Imports
55
55
ITCL_KW = (2, "@scope body class code common component configbody constructor "
56
56
              "define destructor hull import inherit itcl itk itk_component "
57
57
              "itk_initialize itk_interior itk_option iwidgets keep method "
58
 
              "private protected public")
 
58
              "private protected public typemethod typevariable")
59
59
 
60
60
TK_COMMANDS = (3, "tk_bisque tk_chooseColor tk_dialog tk_focusFollowsMouse "
61
61
                  "tk_focusNext tk_focusPrev tk_getOpenFile tk_getSaveFile "