mirror of
				https://github.com/python/cpython.git
				synced 2025-11-03 23:21:29 +00:00 
			
		
		
		
	Patch #1472877: Fix Tix subwidget name resolution.
Will backport to 2.5.
This commit is contained in:
		
							parent
							
								
									ef5fd3e7c9
								
							
						
					
					
						commit
						bba003ef24
					
				
					 2 changed files with 6 additions and 1 deletions
				
			
		| 
						 | 
					@ -421,7 +421,7 @@ def __init__(self, master, name,
 | 
				
			||||||
            except:
 | 
					            except:
 | 
				
			||||||
                plist = []
 | 
					                plist = []
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        if (not check_intermediate) or len(plist) < 2:
 | 
					        if not check_intermediate:
 | 
				
			||||||
            # immediate descendant
 | 
					            # immediate descendant
 | 
				
			||||||
            TixWidget.__init__(self, master, None, None, {'name' : name})
 | 
					            TixWidget.__init__(self, master, None, None, {'name' : name})
 | 
				
			||||||
        else:
 | 
					        else:
 | 
				
			||||||
| 
						 | 
					@ -437,6 +437,9 @@ def __init__(self, master, name,
 | 
				
			||||||
                    parent = TixSubWidget(parent, plist[i],
 | 
					                    parent = TixSubWidget(parent, plist[i],
 | 
				
			||||||
                                          destroy_physically=0,
 | 
					                                          destroy_physically=0,
 | 
				
			||||||
                                          check_intermediate=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})
 | 
					            TixWidget.__init__(self, parent, None, None, {'name' : name})
 | 
				
			||||||
        self.destroy_physically = destroy_physically
 | 
					        self.destroy_physically = destroy_physically
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -98,6 +98,8 @@ Core and builtins
 | 
				
			||||||
Library
 | 
					Library
 | 
				
			||||||
-------
 | 
					-------
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					- Patch #1472877: Fix Tix subwidget name resolution.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
- Patch #1594554: Always close a tkSimpleDialog on ok(), even
 | 
					- Patch #1594554: Always close a tkSimpleDialog on ok(), even
 | 
				
			||||||
  if an exception occurs.
 | 
					  if an exception occurs.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue