Mercurial > cpython-lru_cache-weakref
diff Lib/tkinter/__init__.py @ 49639:f67b2c8fa93a
Issue #3774: Fixed an error when create a Tkinter menu item without command
and then remove it. Written by Guilherme Polo (gpolo). Ported r67082.
| author | Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> |
|---|---|
| date | Tue, 04 Nov 2008 06:26:27 +0000 |
| parents | 5c10af8d33f5 |
| children | 6c8ed6674328 |
line wrap: on
line diff
--- a/Lib/tkinter/__init__.py Tue Nov 04 00:35:10 2008 +0000 +++ b/Lib/tkinter/__init__.py Tue Nov 04 06:26:27 2008 +0000 @@ -1913,6 +1913,8 @@ cnf = _cnfmerge((cnf, kw)) self.widgetName = widgetName BaseWidget._setup(self, master, cnf) + if self._tclCommands is None: + self._tclCommands = [] classes = [(k, v) for k, v in cnf.items() if isinstance(k, type)] for k, v in classes: del cnf[k] @@ -2648,21 +2650,20 @@ """Add separator at INDEX.""" self.insert(index, 'separator', cnf or kw) 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: index2 = index1 - cmds = [] - (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) + + num_index1, num_index2 = self.index(index1), self.index(index2) + if (num_index1 is None) or (num_index2 is None): + num_index1, num_index2 = 0, -1 + + for i in range(num_index1, num_index2 + 1): + if 'command' in self.entryconfig(i): + c = str(self.entrycget(i, 'command')) + if c: + self.deletecommand(c) self.tk.call(self._w, 'delete', index1, index2) - for c in cmds: - self.deletecommand(c) - def entrycget(self, index, option): """Return the resource value of an menu item for OPTION at INDEX.""" return self.tk.call(self._w, 'entrycget', index, '-' + option)
