diff options
author | Serhiy Storchaka <storchaka@gmail.com> | 2014-06-01 08:21:55 (GMT) |
---|---|---|
committer | Serhiy Storchaka <storchaka@gmail.com> | 2014-06-01 08:21:55 (GMT) |
commit | 8381f90ee0564745c5b0f59b4ca7e6cef2a54565 (patch) | |
tree | 75b35b277f1750cd81e783fb0a89ae2b2bd1c517 /Lib/tkinter/ttk.py | |
parent | 078b8a81b13914b983760745ce0dac31f1c05145 (diff) | |
download | cpython-8381f90ee0564745c5b0f59b4ca7e6cef2a54565.zip cpython-8381f90ee0564745c5b0f59b4ca7e6cef2a54565.tar.gz cpython-8381f90ee0564745c5b0f59b4ca7e6cef2a54565.tar.bz2 |
Added missed calls of splitlist().
Diffstat (limited to 'Lib/tkinter/ttk.py')
-rw-r--r-- | Lib/tkinter/ttk.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Lib/tkinter/ttk.py b/Lib/tkinter/ttk.py index 81f909c9..c6ca9a5 100644 --- a/Lib/tkinter/ttk.py +++ b/Lib/tkinter/ttk.py @@ -275,6 +275,7 @@ def _list_from_statespec(stuple): def _list_from_layouttuple(tk, ltuple): """Construct a list from the tuple returned by ttk::layout, this is somewhat the reverse of _format_layoutlist.""" + ltuple = tk.splitlist(ltuple) res = [] indx = 0 @@ -293,8 +294,6 @@ def _list_from_layouttuple(tk, ltuple): indx += 2 if opt == 'children': - if not tk.wantobjects(): - val = tk.splitlist(val) val = _list_from_layouttuple(tk, val) opts[opt] = val @@ -408,8 +407,8 @@ class Style(object): return _list_from_statespec(self.tk.splitlist( self.tk.call(self._name, "map", style, '-%s' % query_opt))) - return _dict_from_tcltuple( - self.tk.call(self._name, "map", style, *(_format_mapdict(kw)))) + return _dict_from_tcltuple(self.tk.splitlist( + self.tk.call(self._name, "map", style, *(_format_mapdict(kw))))) def lookup(self, style, option, state=None, default=None): @@ -463,8 +462,8 @@ class Style(object): lspec = "null" # could be any other word, but this may make sense # when calling layout(style) later - return _list_from_layouttuple(self.tk, self.tk.splitlist( - self.tk.call(self._name, "layout", style, lspec))) + return _list_from_layouttuple(self.tk, + self.tk.call(self._name, "layout", style, lspec)) def element_create(self, elementname, etype, *args, **kw): |