summaryrefslogtreecommitdiffstats
path: root/Lib/tkinter/tix.py
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2016-09-25 13:46:10 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2016-09-25 13:46:10 (GMT)
commite6f0199c190754cf0da60f98f85e2503109e692d (patch)
tree9eff07c2e7cb3c3198b83e07611bc1342cb6aef5 /Lib/tkinter/tix.py
parent613f8e513cf171a335318221b6050d470a1d765f (diff)
downloadcpython-e6f0199c190754cf0da60f98f85e2503109e692d.zip
cpython-e6f0199c190754cf0da60f98f85e2503109e692d.tar.gz
cpython-e6f0199c190754cf0da60f98f85e2503109e692d.tar.bz2
Issue #27611: Fixed support of default root window in the tkinter.tix module.
Diffstat (limited to 'Lib/tkinter/tix.py')
-rw-r--r--Lib/tkinter/tix.py13
1 files changed, 9 insertions, 4 deletions
diff --git a/Lib/tkinter/tix.py b/Lib/tkinter/tix.py
index 89113fd..7fb4bc5 100644
--- a/Lib/tkinter/tix.py
+++ b/Lib/tkinter/tix.py
@@ -477,10 +477,15 @@ class DisplayStyle:
(multiple) Display Items"""
def __init__(self, itemtype, cnf={}, **kw):
- master = tkinter._default_root # global from Tkinter
- if not master and 'refwindow' in cnf: master=cnf['refwindow']
- elif not master and 'refwindow' in kw: master= kw['refwindow']
- elif not master: raise RuntimeError("Too early to create display style: no root window")
+ if 'refwindow' in kw:
+ master = kw['refwindow']
+ elif 'refwindow' in cnf:
+ master = cnf['refwindow']
+ else:
+ master = tkinter._default_root
+ if not master:
+ raise RuntimeError("Too early to create display style: "
+ "no root window")
self.tk = master.tk
self.stylename = self.tk.call('tixDisplayStyle', itemtype,
*self._options(cnf,kw) )