Merged revisions 65971 via svnmerge from

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

........
  r65971 | robert.schuppenies | 2008-08-22 10:03:43 +0200 (Fri, 22 Aug 2008) | 2 lines

  Issue #1342811: Fixed broken patch. Reviewed by benjamin.peterson.
........
This commit is contained in:
Robert Schuppenies 2008-08-22 08:27:53 +00:00
parent 6b84b6c6dc
commit ffeef9044e
1 changed files with 7 additions and 5 deletions

View File

@ -2654,11 +2654,13 @@ class Menu(Widget):
if index2 is None:
index2 = index1
cmds = []
for i in range(self.index(index1), self.index(index2)+1):
if 'command' in self.entryconfig(i):
c = str(self.entrycget(i, 'command'))
if c in self._tclCommands:
cmds.append(c)
(num_index1, num_index2) = (self.index(index1), self.index(index2))
if (num_index1 is not None) and (num_index2 is not None):
for i in range(num_index1, num_index2 + 1):
if 'command' in self.entryconfig(i):
c = str(self.entrycget(i, 'command'))
if c in self._tclCommands:
cmds.append(c)
self.tk.call(self._w, 'delete', index1, index2)
for c in cmds:
self.deletecommand(c)