[Python-checkins] r52785 - in python/branches/release25-maint: Lib/lib-tk/Tix.py Misc/NEWS

[martin.v.loewis]

Author: martin.v.loewis
Date: Sat Nov 18 19:42:22 2006
New Revision: 52785

Modified:
   python/branches/release25-maint/Lib/lib-tk/Tix.py
   python/branches/release25-maint/Misc/NEWS
Log:
Patch #1472877: Fix Tix subwidget name resolution.


Modified: python/branches/release25-maint/Lib/lib-tk/Tix.py
==============================================================================
--- python/branches/release25-maint/Lib/lib-tk/Tix.py	(original)
+++ python/branches/release25-maint/Lib/lib-tk/Tix.py	Sat Nov 18 19:42:22 2006
@@ -421,7 +421,7 @@
             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 @@
                     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
 

Modified: python/branches/release25-maint/Misc/NEWS
==============================================================================
--- python/branches/release25-maint/Misc/NEWS	(original)
+++ python/branches/release25-maint/Misc/NEWS	Sat Nov 18 19:42:22 2006
@@ -103,6 +103,8 @@
 Library
 -------
 
+- Patch #1472877: Fix Tix subwidget name resolution.
+
 - Patch #1594554: Always close a tkSimpleDialog on ok(), even
   if an exception occurs.