Restore the capability to pass a class (usually Pack) as an option to widget
creation; no longer support this for the config method.
diff --git a/Lib/tkinter/Tkinter.py b/Lib/tkinter/Tkinter.py
index 4c7fd71..ac814a9 100755
--- a/Lib/tkinter/Tkinter.py
+++ b/Lib/tkinter/Tkinter.py
@@ -827,8 +827,15 @@
cnf = _cnfmerge((cnf, kw))
self.widgetName = widgetName
Widget._setup(self, master, cnf)
+ classes = []
+ for k in cnf.keys():
+ if type(k) is ClassType:
+ classes.append((k, cnf[k]))
+ del cnf[k]
apply(self.tk.call,
(widgetName, self._w) + extra + self._options(cnf))
+ for k, v in classes:
+ k.config(self, v)
def config(self, cnf=None, **kw):
# XXX ought to generalize this so tag_config etc. can use it
if kw:
@@ -845,10 +852,6 @@
x = self.tk.split(self.tk.call(
self._w, 'configure', '-'+cnf))
return (x[0][1:],) + x[1:]
- for k in cnf.keys():
- if type(k) is ClassType:
- k.config(self, cnf[k])
- del cnf[k]
apply(self.tk.call, (self._w, 'configure')
+ self._options(cnf))
configure = config