summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfvogel <fvogelnew1@free.fr>2020-02-11 20:53:17 (GMT)
committerfvogel <fvogelnew1@free.fr>2020-02-11 20:53:17 (GMT)
commit0bf2c0e761b6fa6e2b292a78207699b09f73afac (patch)
tree0d04c7eba6b471b5100dcfc20f53b4cf8649c6e5
parentbfbc68c61c61cd01da46a91806f7bd3b6bba4e2d (diff)
downloadtk-0bf2c0e761b6fa6e2b292a78207699b09f73afac.zip
tk-0bf2c0e761b6fa6e2b292a78207699b09f73afac.tar.gz
tk-0bf2c0e761b6fa6e2b292a78207699b09f73afac.tar.bz2
Revert the 6 previous commits, returning therefore to the state at [eaad647e].
-rw-r--r--tests/bind.test26
-rw-r--r--unix/tkUnixKey.c4
2 files changed, 2 insertions, 28 deletions
diff --git a/tests/bind.test b/tests/bind.test
index 7a91999..7cb515d 100644
--- a/tests/bind.test
+++ b/tests/bind.test
@@ -2049,32 +2049,6 @@ test bind-16.35 {ExpandPercents procedure} -constraints {
} -cleanup {
destroy .t.f
} -result {a A { } {\r} {{}} {{}} { } {\$} \\\{ {{}} {{}} \u00e9}
-test bind-16.35.1 {ExpandPercents procedure} -constraints {
- nonPortable
-} -setup {
- frame .t.f -class Test -width 150 -height 100
- pack .t.f
- focus -force .t.f
- update
- set x {}
-} -body {
- bind .t.f <KeyRelease> {lappend x "%A"}
- event generate .t.f <KeyRelease-a>
- event generate .t.f <KeyRelease-A> -state 1
- event generate .t.f <KeyRelease-Tab>
- event generate .t.f <KeyRelease-Return>
- event generate .t.f <KeyRelease-F1>
- event generate .t.f <KeyRelease-Shift_L>
- event generate .t.f <KeyRelease-space>
- event generate .t.f <KeyRelease-dollar> -state 1
- event generate .t.f <KeyRelease-braceleft> -state 1
- event generate .t.f <KeyRelease-Multi_key>
- event generate .t.f <KeyRelease-e>
- event generate .t.f <KeyRelease-apostrophe>
- set x
-} -cleanup {
- destroy .t.f
-} -result {a A { } {\r} {{}} {{}} { } {\$} \\\{ {{}} {{}} \u00e9}
test bind-16.36 {ExpandPercents procedure} -setup {
frame .t.f -class Test -width 150 -height 100
pack .t.f
diff --git a/unix/tkUnixKey.c b/unix/tkUnixKey.c
index 21fa81a..1bfbf26 100644
--- a/unix/tkUnixKey.c
+++ b/unix/tkUnixKey.c
@@ -126,11 +126,11 @@ TkpGetString(
}
/*
- * Only do this for KeyPress and KeyRelease events, otherwise
+ * Only do this for KeyPress events, otherwise
* further Xlib function behavior might be undefined.
*/
- if (eventPtr->type != KeyPress && eventPtr->type != KeyRelease) {
+ if (eventPtr->type != KeyPress) {
len = 0;
Tcl_DStringSetLength(dsPtr, len);
goto done;