Skip to content

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

Some more changes from the net... Typos, 4.0/4.1 issues, new tkButtonInvoke().

üst 37dcab19
Show whitespace changes
Inline Side-by-side
Showing with 46 additions and 6 deletions
Lib/lib-tk/Tkinter.py
Dosyayı görüntüle @ 36269993
...@@ -24,8 +24,21 @@ from types import * ...@@ -24,8 +24,21 @@ from types import *
from Tkconstants import * from Tkconstants import *
import string; _string = string; del string import string; _string = string; del string
TkVersion = eval(tkinter.TK_VERSION) TkVersion = _string.atof(tkinter.TK_VERSION)
TclVersion = eval(tkinter.TCL_VERSION) TclVersion = _string.atof(tkinter.TCL_VERSION)
######################################################################
# Since the values of file event masks changed from Tk 4.0 to Tk 4.1,
# they are defined here (and not in Tkconstants):
######################################################################
if TkVersion >= 4.1:
READABLE = 2
WRITABLE = 4
EXCEPTION = 8
else:
READABLE = 1
WRITABLE = 2
EXCEPTION = 4
def _flatten(tuple): def _flatten(tuple):
...@@ -249,7 +262,7 @@ class Misc: ...@@ -249,7 +262,7 @@ class Misc:
def winfo_class(self): def winfo_class(self):
return self.tk.call('winfo', 'class', self._w) return self.tk.call('winfo', 'class', self._w)
def winfo_containing(self, rootX, rootY): def winfo_containing(self, rootX, rootY):
return self.tk.call('winfo', 'containing', rootx, rootY) return self.tk.call('winfo', 'containing', rootX, rootY)
def winfo_depth(self): def winfo_depth(self):
return self.tk.getint(self.tk.call('winfo', 'depth', self._w)) return self.tk.getint(self.tk.call('winfo', 'depth', self._w))
def winfo_exists(self): def winfo_exists(self):
...@@ -451,7 +464,12 @@ class Misc: ...@@ -451,7 +464,12 @@ class Misc:
except TclError: pass except TclError: pass
e.height = tk.getint(h) e.height = tk.getint(h)
e.keycode = tk.getint(k) e.keycode = tk.getint(k)
# For Visibility events, event state is a string and
# not an integer:
try:
e.state = tk.getint(s) e.state = tk.getint(s)
except TclError:
e.state = s
e.time = tk.getint(t) e.time = tk.getint(t)
e.width = tk.getint(w) e.width = tk.getint(w)
e.x = tk.getint(x) e.x = tk.getint(x)
...@@ -865,6 +883,8 @@ class Button(Widget): ...@@ -865,6 +883,8 @@ class Button(Widget):
self.tk.call('tkButtonDown', self._w) self.tk.call('tkButtonDown', self._w)
def tkButtonUp(self, *dummy): def tkButtonUp(self, *dummy):
self.tk.call('tkButtonUp', self._w) self.tk.call('tkButtonUp', self._w)
def tkButtonInvoke(self, *dummy):
self.tk.call('tkButtonInvoke', self._w)
def flash(self): def flash(self):
self.tk.call(self._w, 'flash') self.tk.call(self._w, 'flash')
def invoke(self): def invoke(self):
......
Lib/tkinter/Tkinter.py
Dosyayı görüntüle @ 36269993
...@@ -24,8 +24,21 @@ from types import * ...@@ -24,8 +24,21 @@ from types import *
from Tkconstants import * from Tkconstants import *
import string; _string = string; del string import string; _string = string; del string
TkVersion = eval(tkinter.TK_VERSION) TkVersion = _string.atof(tkinter.TK_VERSION)
TclVersion = eval(tkinter.TCL_VERSION) TclVersion = _string.atof(tkinter.TCL_VERSION)
######################################################################
# Since the values of file event masks changed from Tk 4.0 to Tk 4.1,
# they are defined here (and not in Tkconstants):
######################################################################
if TkVersion >= 4.1:
READABLE = 2
WRITABLE = 4
EXCEPTION = 8
else:
READABLE = 1
WRITABLE = 2
EXCEPTION = 4
def _flatten(tuple): def _flatten(tuple):
...@@ -249,7 +262,7 @@ class Misc: ...@@ -249,7 +262,7 @@ class Misc:
def winfo_class(self): def winfo_class(self):
return self.tk.call('winfo', 'class', self._w) return self.tk.call('winfo', 'class', self._w)
def winfo_containing(self, rootX, rootY): def winfo_containing(self, rootX, rootY):
return self.tk.call('winfo', 'containing', rootx, rootY) return self.tk.call('winfo', 'containing', rootX, rootY)
def winfo_depth(self): def winfo_depth(self):
return self.tk.getint(self.tk.call('winfo', 'depth', self._w)) return self.tk.getint(self.tk.call('winfo', 'depth', self._w))
def winfo_exists(self): def winfo_exists(self):
...@@ -451,7 +464,12 @@ class Misc: ...@@ -451,7 +464,12 @@ class Misc:
except TclError: pass except TclError: pass
e.height = tk.getint(h) e.height = tk.getint(h)
e.keycode = tk.getint(k) e.keycode = tk.getint(k)
# For Visibility events, event state is a string and
# not an integer:
try:
e.state = tk.getint(s) e.state = tk.getint(s)
except TclError:
e.state = s
e.time = tk.getint(t) e.time = tk.getint(t)
e.width = tk.getint(w) e.width = tk.getint(w)
e.x = tk.getint(x) e.x = tk.getint(x)
...@@ -865,6 +883,8 @@ class Button(Widget): ...@@ -865,6 +883,8 @@ class Button(Widget):
self.tk.call('tkButtonDown', self._w) self.tk.call('tkButtonDown', self._w)
def tkButtonUp(self, *dummy): def tkButtonUp(self, *dummy):
self.tk.call('tkButtonUp', self._w) self.tk.call('tkButtonUp', self._w)
def tkButtonInvoke(self, *dummy):
self.tk.call('tkButtonInvoke', self._w)
def flash(self): def flash(self):
self.tk.call(self._w, 'flash') self.tk.call(self._w, 'flash')
def invoke(self): def invoke(self):
......
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