diff options
| author | fvogel <fvogelnew1@free.fr> | 2016-05-20 15:31:34 (GMT) |
|---|---|---|
| committer | fvogel <fvogelnew1@free.fr> | 2016-05-20 15:31:34 (GMT) |
| commit | 2f150c8d18e576998e9d30ac08c562a1365b3051 (patch) | |
| tree | 0bf494ef3df37666de672ecad8113c5146bcecbe | |
| parent | 7f319fbd695d47a2c7d4c68a90a9f90072a56085 (diff) | |
| parent | 1c0858ce27408d641e6b3bb8f66e9b59cf630014 (diff) | |
| download | tk-2f150c8d18e576998e9d30ac08c562a1365b3051.zip tk-2f150c8d18e576998e9d30ac08c562a1365b3051.tar.gz tk-2f150c8d18e576998e9d30ac08c562a1365b3051.tar.bz2 | |
Fixed [011706ec42] for the scrollbar case
| -rw-r--r-- | library/scrlbar.tcl | 11 | ||||
| -rw-r--r-- | tests/scrollbar.test | 37 |
2 files changed, 45 insertions, 3 deletions
diff --git a/library/scrlbar.tcl b/library/scrlbar.tcl index b7be014..6f1caa2 100644 --- a/library/scrlbar.tcl +++ b/library/scrlbar.tcl @@ -430,6 +430,9 @@ proc ::tk::ScrollTopBottom {w x y} { proc ::tk::ScrollButton2Down {w x y} { variable ::tk::Priv + if {![winfo exists $w]} { + return + } set element [$w identify $x $y] if {[string match {arrow[12]} $element]} { ScrollButtonDown $w $x $y @@ -443,7 +446,9 @@ proc ::tk::ScrollButton2Down {w x y} { # slider drag. update idletasks - $w configure -activerelief sunken - $w activate slider - ScrollStartDrag $w $x $y + if {[winfo exists $w]} { + $w configure -activerelief sunken + $w activate slider + ScrollStartDrag $w $x $y + } } diff --git a/tests/scrollbar.test b/tests/scrollbar.test index 3b16821..bd14067 100644 --- a/tests/scrollbar.test +++ b/tests/scrollbar.test @@ -662,6 +662,43 @@ test scrollbar-10.2 {<MouseWheel> event on scrollbar} -constraints {win|unix} -s destroy .t .s } -result {1.4} +test scrollbar-11.1 {bug fix: [011706ec42] Scrollbar unsafe wrt widget destruction} -body { + proc destroy_scrollbar {} { + if {[winfo exists .top.s]} { + destroy .top.s + } + } + toplevel .top + scrollbar .top.s + bind .top.s <2> {destroy_scrollbar} + pack .top.s + focus -force .top.s + update + event generate .top.s <2> + update ; # shall not trigger error invalid command name ".top.s" +} -cleanup { + destroy .top.s .top +} -result {} +test scrollbar-11.2 {bug fix: [011706ec42] Scrollbar unsafe wrt widget destruction} -body { + proc destroy_scrollbar {{y 0}} { + if {[winfo exists .top.s]} { + destroy .top.s + } + } + toplevel .top + wm minsize .top 50 400 + update + scrollbar .top.s + bind .top.s <2> {after idle destroy_scrollbar} + pack .top.s -expand true -fill y + focus -force .top.s + update + event generate .top.s <2> -x 2 -y [expr {[winfo height .top.s] / 2}] + update ; # shall not trigger error invalid command name ".top.s" +} -cleanup { + destroy .top.s .top +} -result {} + catch {destroy .s} catch {destroy .t} |