mirrors/cpython
0
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2024-11-23 18:04:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Dialog.py: d.num should be numeric, not string

Browse Source 
Tkinter.py: on destroy(), remove self from master's dict of children
This commit is contained in:
Guido van Rossum 1994-08-30 12:13:44 +00:00
parent c1be9d59e4
commit f023ab0471
4 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,11 +4,12 @@ from Tkinter import *
class Dialog(Widget):
def __init__(self, master=None, cnf={}):
Widget._setup(self, master, cnf)
self.num = apply(self.tk.call,
('tk_dialog', self._w,
cnf['title'], cnf['text'],
cnf['bitmap'], cnf['default'])
+ cnf['strings'])
self.num = self.tk.getint(
apply(self.tk.call,
('tk_dialog', self._w,
cnf['title'], cnf['text'],
cnf['bitmap'], cnf['default'])
+ cnf['strings']))
try: Widget.destroy(self)
except TclError: pass
def destroy(self): pass

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

@ -679,6 +679,8 @@ class Widget(Misc, Pack, Place):
return self._w
def destroy(self):
for c in self.children.values(): c.destroy()
if self.master.children.has_key(self._name):
del self.master.children[self._name]
self.tk.call('destroy', self._w)
def _do(self, name, args=()):
return apply(self.tk.call, (self._w, name) + args)

11
Lib/tkinter/Dialog.py
View File

@ -4,11 +4,12 @@ from Tkinter import *
class Dialog(Widget):
def __init__(self, master=None, cnf={}):
Widget._setup(self, master, cnf)
self.num = apply(self.tk.call,
('tk_dialog', self._w,
cnf['title'], cnf['text'],
cnf['bitmap'], cnf['default'])
+ cnf['strings'])
self.num = self.tk.getint(
apply(self.tk.call,
('tk_dialog', self._w,
cnf['title'], cnf['text'],
cnf['bitmap'], cnf['default'])
+ cnf['strings']))
try: Widget.destroy(self)
except TclError: pass
def destroy(self): pass

2
Lib/tkinter/Tkinter.py
View File

@ -679,6 +679,8 @@ class Widget(Misc, Pack, Place):
return self._w
def destroy(self):
for c in self.children.values(): c.destroy()
if self.master.children.has_key(self._name):
del self.master.children[self._name]
self.tk.call('destroy', self._w)
def _do(self, name, args=()):
return apply(self.tk.call, (self._w, name) + args)