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

Restore the capability to pass a class (usually Pack) as an option to widget 

creation; no longer support this for the config method.
This commit is contained in:
Guido van Rossum 1996-07-21 03:05:05 +00:00
parent 81652ab67a
commit ad8b3baa91
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -827,8 +827,15 @@ class Widget(Misc, Pack, Place, Grid):
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 @@ class Widget(Misc, Pack, Place, Grid):
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

11
Lib/tkinter/Tkinter.py
View File

@ -827,8 +827,15 @@ class Widget(Misc, Pack, Place, Grid):
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 @@ class Widget(Misc, Pack, Place, Grid):
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