Skip to content

C
cpython
Kaydet (Commit) 97aeca15 authored tarafından Guido van Rossum's avatar Guido van Rossum
Dosyalara gözat
Seçenekler

Added _exit and register as Tcl command exit. Micro lay-out fix.

üst d308e2ba
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 4 deletions
Lib/lib-tk/Tkinter.py
Dosyayı görüntüle @ 97aeca15
...@@ -46,6 +46,10 @@ _default_root = None ...@@ -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): ...@@ -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): ...@@ -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))
......
Lib/tkinter/Tkinter.py
Dosyayı görüntüle @ 97aeca15
...@@ -46,6 +46,10 @@ _default_root = None ...@@ -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): ...@@ -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): ...@@ -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))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment