mirror of
				https://github.com/python/cpython.git
				synced 2025-11-03 19:34:08 +00:00 
			
		
		
		
	Added _exit and register as Tcl command exit. Micro lay-out fix.
This commit is contained in:
		
							parent
							
								
									d308e2ba3e
								
							
						
					
					
						commit
						97aeca1527
					
				
					 2 changed files with 12 additions and 4 deletions
				
			
		| 
						 | 
					@ -46,6 +46,10 @@ _default_root = None
 | 
				
			||||||
def _tkerror(err):
 | 
					def _tkerror(err):
 | 
				
			||||||
	pass
 | 
						pass
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					def _exit(code='0'):
 | 
				
			||||||
 | 
						import sys
 | 
				
			||||||
 | 
						sys.exit(getint(code))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
_varnum = 0
 | 
					_varnum = 0
 | 
				
			||||||
class Variable:
 | 
					class Variable:
 | 
				
			||||||
	def __init__(self, master=None):
 | 
						def __init__(self, master=None):
 | 
				
			||||||
| 
						 | 
					@ -529,6 +533,7 @@ class Tk(Misc, Wm):
 | 
				
			||||||
			if baseName[-3:] == '.py': baseName = baseName[:-3]
 | 
								if baseName[-3:] == '.py': baseName = baseName[:-3]
 | 
				
			||||||
		self.tk = tkinter.create(screenName, baseName, className)
 | 
							self.tk = tkinter.create(screenName, baseName, className)
 | 
				
			||||||
		self.tk.createcommand('tkerror', _tkerror)
 | 
							self.tk.createcommand('tkerror', _tkerror)
 | 
				
			||||||
 | 
							self.tk.createcommand('exit', _exit)
 | 
				
			||||||
	def destroy(self):
 | 
						def destroy(self):
 | 
				
			||||||
		for c in self.children.values(): c.destroy()
 | 
							for c in self.children.values(): c.destroy()
 | 
				
			||||||
##		del self.master.children[self._name]
 | 
					##		del self.master.children[self._name]
 | 
				
			||||||
| 
						 | 
					@ -1078,8 +1083,7 @@ class Text(Widget):
 | 
				
			||||||
	def tag_delete(self, *tagNames):
 | 
						def tag_delete(self, *tagNames):
 | 
				
			||||||
		apply(self.tk.call, (self._w, 'tag', 'delete') + tagNames)
 | 
							apply(self.tk.call, (self._w, 'tag', 'delete') + tagNames)
 | 
				
			||||||
	def tag_lower(self, tagName, belowThis=None):
 | 
						def tag_lower(self, tagName, belowThis=None):
 | 
				
			||||||
		self.tk.call(self._w, 'tag', 'lower', 
 | 
							self.tk.call(self._w, 'tag', 'lower', tagName, belowThis)
 | 
				
			||||||
			     tagName, belowThis)
 | 
					 | 
				
			||||||
	def tag_names(self, index=None):
 | 
						def tag_names(self, index=None):
 | 
				
			||||||
		return self.tk.splitlist(
 | 
							return self.tk.splitlist(
 | 
				
			||||||
			self.tk.call(self._w, 'tag', 'names', index))
 | 
								self.tk.call(self._w, 'tag', 'names', index))
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -46,6 +46,10 @@ _default_root = None
 | 
				
			||||||
def _tkerror(err):
 | 
					def _tkerror(err):
 | 
				
			||||||
	pass
 | 
						pass
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					def _exit(code='0'):
 | 
				
			||||||
 | 
						import sys
 | 
				
			||||||
 | 
						sys.exit(getint(code))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
_varnum = 0
 | 
					_varnum = 0
 | 
				
			||||||
class Variable:
 | 
					class Variable:
 | 
				
			||||||
	def __init__(self, master=None):
 | 
						def __init__(self, master=None):
 | 
				
			||||||
| 
						 | 
					@ -529,6 +533,7 @@ class Tk(Misc, Wm):
 | 
				
			||||||
			if baseName[-3:] == '.py': baseName = baseName[:-3]
 | 
								if baseName[-3:] == '.py': baseName = baseName[:-3]
 | 
				
			||||||
		self.tk = tkinter.create(screenName, baseName, className)
 | 
							self.tk = tkinter.create(screenName, baseName, className)
 | 
				
			||||||
		self.tk.createcommand('tkerror', _tkerror)
 | 
							self.tk.createcommand('tkerror', _tkerror)
 | 
				
			||||||
 | 
							self.tk.createcommand('exit', _exit)
 | 
				
			||||||
	def destroy(self):
 | 
						def destroy(self):
 | 
				
			||||||
		for c in self.children.values(): c.destroy()
 | 
							for c in self.children.values(): c.destroy()
 | 
				
			||||||
##		del self.master.children[self._name]
 | 
					##		del self.master.children[self._name]
 | 
				
			||||||
| 
						 | 
					@ -1078,8 +1083,7 @@ class Text(Widget):
 | 
				
			||||||
	def tag_delete(self, *tagNames):
 | 
						def tag_delete(self, *tagNames):
 | 
				
			||||||
		apply(self.tk.call, (self._w, 'tag', 'delete') + tagNames)
 | 
							apply(self.tk.call, (self._w, 'tag', 'delete') + tagNames)
 | 
				
			||||||
	def tag_lower(self, tagName, belowThis=None):
 | 
						def tag_lower(self, tagName, belowThis=None):
 | 
				
			||||||
		self.tk.call(self._w, 'tag', 'lower', 
 | 
							self.tk.call(self._w, 'tag', 'lower', tagName, belowThis)
 | 
				
			||||||
			     tagName, belowThis)
 | 
					 | 
				
			||||||
	def tag_names(self, index=None):
 | 
						def tag_names(self, index=None):
 | 
				
			||||||
		return self.tk.splitlist(
 | 
							return self.tk.splitlist(
 | 
				
			||||||
			self.tk.call(self._w, 'tag', 'names', index))
 | 
								self.tk.call(self._w, 'tag', 'names', index))
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue