[Python-checkins] cpython (merge 3.5 -> 3.6): Issue #27611: Fixed support of default root window in the tkinter.tix module.

[serhiy.storchaka]

https://hg.python.org/cpython/rev/ec3f5d21bec0
changeset:   104058:ec3f5d21bec0
branch:      3.6
parent:      104054:58740ad9e568
parent:      104057:7b458bcdab75
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Sun Sep 25 16:52:13 2016 +0300
summary:
  Issue #27611: Fixed support of default root window in the tkinter.tix module.
Added the master parameter in the DisplayStyle constructor.

files:
  Lib/tkinter/tix.py |  16 +++++++++++-----
  Misc/NEWS          |   3 +++
  2 files changed, 14 insertions(+), 5 deletions(-)


diff --git a/Lib/tkinter/tix.py b/Lib/tkinter/tix.py
--- a/Lib/tkinter/tix.py
+++ b/Lib/tkinter/tix.py
@@ -472,11 +472,17 @@
     """DisplayStyle - handle configuration options shared by
     (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")
+    def __init__(self, itemtype, cnf={}, *, master=None, **kw):
+        if not master:
+            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) )
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -41,6 +41,9 @@
 Library
 -------
 
+- Issue #27611: Fixed support of default root window in the tkinter.tix module.
+  Added the master parameter in the DisplayStyle constructor.
+
 - Issue #27348: In the traceback module, restore the formatting of exception
   messages like "Exception: None".  This fixes a regression introduced in
   3.5a2.

-- 
Repository URL: https://hg.python.org/cpython