Skip to content

C
cpython
Commit 67ef5f3f authored by Guido van Rossum's avatar Guido van Rossum
Browse files
Options

* Tkinter.py (Canvas): made create_ methods return the item id; 

	flatten argument list to _create before passing on to tk.call;
	_do should return a value.
parent 45853db8
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 20 deletions
Lib/lib-tk/Tkinter.py
View file @ 67ef5f3f
...@@ -11,6 +11,8 @@ def _isfunctype(func): ...@@ -11,6 +11,8 @@ def _isfunctype(func):
FunctionType = type(_isfunctype) FunctionType = type(_isfunctype)
ClassType = type(_Dummy) ClassType = type(_Dummy)
MethodType = type(_Dummy.meth) MethodType = type(_Dummy.meth)
TupleType = type(())
ListType = type([])
def _tkerror(err): def _tkerror(err):
pass pass
...@@ -518,7 +520,7 @@ class Widget(Misc, Pack, Place): ...@@ -518,7 +520,7 @@ class Widget(Misc, Pack, Place):
del self.master.children[self._name] del self.master.children[self._name]
self.tk.call('destroy', self._w) self.tk.call('destroy', self._w)
def _do(self, name, args=()): def _do(self, name, args=()):
apply(self.tk.call, (self._w, name) + args) return apply(self.tk.call, (self._w, name) + args)
class Toplevel(Widget, Wm): class Toplevel(Widget, Wm):
def __init__(self, master=None, cnf={}): def __init__(self, master=None, cnf={}):
...@@ -594,26 +596,26 @@ class Canvas(Widget): ...@@ -594,26 +596,26 @@ class Canvas(Widget):
args = args[:-1] args = args[:-1]
else: else:
cnf = {} cnf = {}
v = (self._w, 'create', itemType) + args v = (self._w, 'create', itemType) + _flatten(args)
for k in cnf.keys(): for k in cnf.keys():
v = v + ('-' + k, cnf[k]) v = v + ('-' + k, cnf[k])
return self.tk.getint(apply(self.tk.call, v)) return self.tk.getint(apply(self.tk.call, v))
def create_arc(self, *args): def create_arc(self, *args):
Canvas._create(self, 'arc', args) return Canvas._create(self, 'arc', args)
def create_bitmap(self, *args): def create_bitmap(self, *args):
Canvas._create(self, 'bitmap', args) return Canvas._create(self, 'bitmap', args)
def create_line(self, *args): def create_line(self, *args):
Canvas._create(self, 'line', args) return Canvas._create(self, 'line', args)
def create_oval(self, *args): def create_oval(self, *args):
Canvas._create(self, 'oval', args) return Canvas._create(self, 'oval', args)
def create_polygon(self, *args): def create_polygon(self, *args):
Canvas._create(self, 'polygon', args) return Canvas._create(self, 'polygon', args)
def create_rectangle(self, *args): def create_rectangle(self, *args):
Canvas._create(self, 'rectangle', args) return Canvas._create(self, 'rectangle', args)
def create_text(self, *args): def create_text(self, *args):
Canvas._create(self, 'text', args) return Canvas._create(self, 'text', args)
def create_window(self, *args): def create_window(self, *args):
Canvas._create(self, 'window', args) return Canvas._create(self, 'window', args)
def dchars(self, *args): def dchars(self, *args):
self._do('dchars', args) self._do('dchars', args)
def delete(self, *args): def delete(self, *args):
...@@ -670,6 +672,15 @@ class Canvas(Widget): ...@@ -670,6 +672,15 @@ class Canvas(Widget):
def yview(self, index): def yview(self, index):
self.tk.call(self._w, 'yview', index) self.tk.call(self._w, 'yview', index)
def _flatten(tuple):
res = ()
for item in tuple:
if type(item) in (TupleType, ListType):
res = res + _flatten(item)
else:
res = res + (item,)
return res
class Checkbutton(Widget): class Checkbutton(Widget):
def __init__(self, master=None, cnf={}): def __init__(self, master=None, cnf={}):
Widget.__init__(self, master, 'checkbutton', cnf) Widget.__init__(self, master, 'checkbutton', cnf)
......
Lib/tkinter/Tkinter.py
View file @ 67ef5f3f
...@@ -11,6 +11,8 @@ def _isfunctype(func): ...@@ -11,6 +11,8 @@ def _isfunctype(func):
FunctionType = type(_isfunctype) FunctionType = type(_isfunctype)
ClassType = type(_Dummy) ClassType = type(_Dummy)
MethodType = type(_Dummy.meth) MethodType = type(_Dummy.meth)
TupleType = type(())
ListType = type([])
def _tkerror(err): def _tkerror(err):
pass pass
...@@ -518,7 +520,7 @@ class Widget(Misc, Pack, Place): ...@@ -518,7 +520,7 @@ class Widget(Misc, Pack, Place):
del self.master.children[self._name] del self.master.children[self._name]
self.tk.call('destroy', self._w) self.tk.call('destroy', self._w)
def _do(self, name, args=()): def _do(self, name, args=()):
apply(self.tk.call, (self._w, name) + args) return apply(self.tk.call, (self._w, name) + args)
class Toplevel(Widget, Wm): class Toplevel(Widget, Wm):
def __init__(self, master=None, cnf={}): def __init__(self, master=None, cnf={}):
...@@ -594,26 +596,26 @@ class Canvas(Widget): ...@@ -594,26 +596,26 @@ class Canvas(Widget):
args = args[:-1] args = args[:-1]
else: else:
cnf = {} cnf = {}
v = (self._w, 'create', itemType) + args v = (self._w, 'create', itemType) + _flatten(args)
for k in cnf.keys(): for k in cnf.keys():
v = v + ('-' + k, cnf[k]) v = v + ('-' + k, cnf[k])
return self.tk.getint(apply(self.tk.call, v)) return self.tk.getint(apply(self.tk.call, v))
def create_arc(self, *args): def create_arc(self, *args):
Canvas._create(self, 'arc', args) return Canvas._create(self, 'arc', args)
def create_bitmap(self, *args): def create_bitmap(self, *args):
Canvas._create(self, 'bitmap', args) return Canvas._create(self, 'bitmap', args)
def create_line(self, *args): def create_line(self, *args):
Canvas._create(self, 'line', args) return Canvas._create(self, 'line', args)
def create_oval(self, *args): def create_oval(self, *args):
Canvas._create(self, 'oval', args) return Canvas._create(self, 'oval', args)
def create_polygon(self, *args): def create_polygon(self, *args):
Canvas._create(self, 'polygon', args) return Canvas._create(self, 'polygon', args)
def create_rectangle(self, *args): def create_rectangle(self, *args):
Canvas._create(self, 'rectangle', args) return Canvas._create(self, 'rectangle', args)
def create_text(self, *args): def create_text(self, *args):
Canvas._create(self, 'text', args) return Canvas._create(self, 'text', args)
def create_window(self, *args): def create_window(self, *args):
Canvas._create(self, 'window', args) return Canvas._create(self, 'window', args)
def dchars(self, *args): def dchars(self, *args):
self._do('dchars', args) self._do('dchars', args)
def delete(self, *args): def delete(self, *args):
...@@ -670,6 +672,15 @@ class Canvas(Widget): ...@@ -670,6 +672,15 @@ class Canvas(Widget):
def yview(self, index): def yview(self, index):
self.tk.call(self._w, 'yview', index) self.tk.call(self._w, 'yview', index)
def _flatten(tuple):
res = ()
for item in tuple:
if type(item) in (TupleType, ListType):
res = res + _flatten(item)
else:
res = res + (item,)
return res
class Checkbutton(Widget): class Checkbutton(Widget):
def __init__(self, master=None, cnf={}): def __init__(self, master=None, cnf={}):
Widget.__init__(self, master, 'checkbutton', cnf) Widget.__init__(self, master, 'checkbutton', cnf)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7