Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merged revisions 67082 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r67082 | hirokazu.yamamoto | 2008-11-04 03:03:06 +0900 | 2 lines

  Issue #3774: Fixed an error when create a Tkinter menu item without command
  and then remove it. Written by Guilherme Polo (gpolo).
........
This commit is contained in:
Hirokazu Yamamoto 2008-11-03 18:10:24 +00:00
parent eeed0c7822
commit b2d8142ed1
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Lib/lib-tk/Tkinter.py
View File

@ -1921,6 +1921,8 @@ class BaseWidget(Misc):
cnf = _cnfmerge((cnf, kw)) cnf = _cnfmerge((cnf, kw))
self.widgetName = widgetName self.widgetName = widgetName
BaseWidget._setup(self, master, cnf) BaseWidget._setup(self, master, cnf)
if self._tclCommands is None:
self._tclCommands = []
classes = [] classes = []
for k in cnf.keys(): for k in cnf.keys():
if type(k) is ClassType: if type(k) is ClassType:
@ -2658,20 +2660,20 @@ class Menu(Widget):
"""Add separator at INDEX.""" """Add separator at INDEX."""
self.insert(index, 'separator', cnf or kw) self.insert(index, 'separator', cnf or kw)
def delete(self, index1, index2=None): def delete(self, index1, index2=None):
"""Delete menu items between INDEX1 and INDEX2 (not included).""" """Delete menu items between INDEX1 and INDEX2 (included)."""
if index2 is None: if index2 is None:
index2 = index1 index2 = index1
cmds = []
(num_index1, num_index2) = (self.index(index1), self.index(index2)) num_index1, num_index2 = self.index(index1), self.index(index2)
if (num_index1 is not None) and (num_index2 is not None): if (num_index1 is None) or (num_index2 is None):
for i in range(num_index1, num_index2 + 1): num_index1, num_index2 = 0, -1
if 'command' in self.entryconfig(i):
c = str(self.entrycget(i, 'command')) for i in range(num_index1, num_index2 + 1):
if c in self._tclCommands: if 'command' in self.entryconfig(i):
cmds.append(c) c = str(self.entrycget(i, 'command'))
if c:
self.deletecommand(c)
self.tk.call(self._w, 'delete', index1, index2) self.tk.call(self._w, 'delete', index1, index2)
for c in cmds:
self.deletecommand(c)
def entrycget(self, index, option): def entrycget(self, index, option):
"""Return the resource value of an menu item for OPTION at INDEX.""" """Return the resource value of an menu item for OPTION at INDEX."""
return self.tk.call(self._w, 'entrycget', index, '-' + option) return self.tk.call(self._w, 'entrycget', index, '-' + option)

3
Misc/NEWS
View File

@ -38,6 +38,9 @@ Core and Builtins
Library Library
------- -------
- Issue #3774: Fixed an error when create a Tkinter menu item without command
and then remove it.
- Fixed a modulefinder crash on certain relative imports. - Fixed a modulefinder crash on certain relative imports.
- Issue #4150: Pdb's "up" command now works for generator frames in post-mortem - Issue #4150: Pdb's "up" command now works for generator frames in post-mortem