summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfvogel <fvogelnew1@free.fr>2016-05-03 17:12:24 (GMT)
committerfvogel <fvogelnew1@free.fr>2016-05-03 17:12:24 (GMT)
commit473bb5cc9b6b28dc7dca5eb9d71b8da7bffac369 (patch)
treec0830a6a3eb0bed28895c61139b30b1d0943848b
parentb1abab58282cc8ff89e73762114369e7a11ce07f (diff)
parentb9aa9a5d2da795de9a7bad7448cc5af7c2c8dd86 (diff)
downloadtk-473bb5cc9b6b28dc7dca5eb9d71b8da7bffac369.zip
tk-473bb5cc9b6b28dc7dca5eb9d71b8da7bffac369.tar.gz
tk-473bb5cc9b6b28dc7dca5eb9d71b8da7bffac369.tar.bz2
Fixed [011706ec42] - tk::ButtonInvoke safety bug
-rw-r--r--library/button.tcl19
-rw-r--r--tests/button.test18
2 files changed, 34 insertions, 3 deletions
diff --git a/library/button.tcl b/library/button.tcl
index b2bafb2..80d8bf9 100644
--- a/library/button.tcl
+++ b/library/button.tcl
@@ -597,12 +597,25 @@ proc ::tk::ButtonUp w {
# w - The name of the widget.
proc ::tk::ButtonInvoke w {
- if {[$w cget -state] ne "disabled"} {
+ if {[winfo exists $w] && [$w cget -state] ne "disabled"} {
set oldRelief [$w cget -relief]
set oldState [$w cget -state]
$w configure -state active -relief sunken
- update idletasks
- after 100
+ after 100 [list ::tk::ButtonInvokeEnd $w $oldState $oldRelief]
+ }
+}
+
+# ::tk::ButtonInvokeEnd --
+# The procedure below is called after a button is invoked through
+# the keyboard. It simulate a release of the button via the mouse.
+#
+# Arguments:
+# w - The name of the widget.
+# oldState - Old state to be set back.
+# oldRelief - Old relief to be set back.
+
+proc ::tk::ButtonInvokeEnd {w oldState oldRelief} {
+ if {[winfo exists $w]} {
$w configure -state $oldState -relief $oldRelief
uplevel #0 [list $w invoke]
}
diff --git a/tests/button.test b/tests/button.test
index 6d924f6..708fc30 100644
--- a/tests/button.test
+++ b/tests/button.test
@@ -3908,6 +3908,24 @@ test button-13.8 {size behavior: checkbutton} -setup {
destroy .a .b .c
} -result {1 1 1}
+test button-14.1 {bug fix: [011706ec42] tk::ButtonInvoke unsafe wrt widget destruction} -body {
+ proc destroy_button {} {
+ if {[winfo exists .top.b]} {
+ destroy .top.b
+ }
+ }
+ toplevel .top
+ button .top.b -text Foo -command destroy_button
+ bind .top.b <space> destroy_button
+ pack .top.b
+ focus -force .top.b
+ update
+ event generate .top.b <space>
+ update ; # shall not trigger error invalid command name ".top.b"
+} -cleanup {
+ destroy .top.b .top
+} -result {}
+
imageFinish
cleanupTests
return