Patch #1472877: Fix Tix subwidget name resolution.

Will backport to 2.5.

diff --git a/Lib/lib-tk/Tix.py b/Lib/lib-tk/Tix.py
index 33ac5190de1f73cf827e54b21649d4c250827211..b7a0fc0776e0d5f56c2c49d59315689ce60e4a95 100755 (executable)
--- a/Lib/lib-tk/Tix.py
+++ b/Lib/lib-tk/Tix.py
@@ -421,7 +421,7 @@ class TixSubWidget(TixWidget):
             except:
                 plist = []
 
-        if (not check_intermediate) or len(plist) < 2:
+        if not check_intermediate:
             # immediate descendant
             TixWidget.__init__(self, master, None, None, {'name' : name})
         else:
@@ -437,6 +437,9 @@ class TixSubWidget(TixWidget):
                     parent = TixSubWidget(parent, plist[i],
                                           destroy_physically=0,
                                           check_intermediate=0)
+            # The Tk widget name is in plist, not in name
+            if plist:
+                name = plist[-1]
             TixWidget.__init__(self, parent, None, None, {'name' : name})
         self.destroy_physically = destroy_physically
 

diff --git a/Misc/NEWS b/Misc/NEWS
index b1cf907228a5cf366a042921c513c0b141aedbdf..4f1df73fac950e53fa7ce180660ab80329b82139 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -98,6 +98,8 @@ Core and builtins
 Library
 -------
 
+- Patch #1472877: Fix Tix subwidget name resolution.
+
 - Patch #1594554: Always close a tkSimpleDialog on ok(), even
   if an exception occurs.