Merged revisions 68468-68470 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r68468 | hirokazu.yamamoto | 2009-01-10 17:09:43 +0900 | 1 line
Bump up Tcl/Tk version on VC6. (tcl8.4.12 -> tcl8.5.2, tk8.4.12 -> tk8.5.2, tix8.4.0 -> tix8.4.3)
........
r68469 | hirokazu.yamamoto | 2009-01-10 17:12:09 +0900 | 1 line
Link to debug version of Tcl/Tk when python is built as debug version.
........
r68470 | hirokazu.yamamoto | 2009-01-10 18:18:16 +0900 | 1 line
Added helper script to build Tcl/Tk.
........
diff --git a/Lib/tkinter/tix.py b/Lib/tkinter/tix.py
index eb566e2..3bfa539 100755
--- a/Lib/tkinter/tix.py
+++ b/Lib/tkinter/tix.py
@@ -293,7 +293,7 @@
else:
static_options = ['options']
- for k,v in cnf.items()[:]:
+ for k,v in list(cnf.items()):
if k in static_options:
extra = extra + ('-' + k, v)
del cnf[k]
@@ -448,7 +448,7 @@
# we must be careful not to destroy the frame widget since this
# also destroys the parent NoteBook thus leading to an exception
# in Tkinter when it finally calls Tcl to destroy the NoteBook
- for c in self.children.values(): c.destroy()
+ for c in list(self.children.values()): c.destroy()
if self._name in self.master.children:
del self.master.children[self._name]
if self._name in self.master.subwidget_list: