traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #1342811: Fix leak in Tkinter.Menu.delete. Commands associated to 

menu entries were not deleted.

Backport from trunk r65622.
This commit is contained in:
Robert Schuppenies 2008-08-10 11:19:25 +00:00
parent 7641b1c943
commit 78813dccd8
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2669,7 +2669,17 @@ class Menu(Widget):
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 (not included)."""
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)
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

@ -74,6 +74,9 @@ Core and builtins
Library Library
------- -------
- Issue #1342811: Fix leak in Tkinter.Menu.delete. Commands associated to
menu entries were not deleted.
- Issue #799428: Fix Tkinter.Misc._nametowidget to unwrap Tcl command objects. - Issue #799428: Fix Tkinter.Misc._nametowidget to unwrap Tcl command objects.
- Issue #3339: dummy_thread.acquire() could return None which is not a valid - Issue #3339: dummy_thread.acquire() could return None which is not a valid