summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2016-01-08 14:39:48 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2016-01-08 14:39:48 (GMT)
commit43554959e209cc2aaf81dbbb6909cf9d77cf57f4 (patch)
tree4cf29d89db8421c07c639141d2472fdbf33a0ac9
parent53100bbaa986eb70a8c1337bd65b096d93bf4ac4 (diff)
downloadtk-43554959e209cc2aaf81dbbb6909cf9d77cf57f4.zip
tk-43554959e209cc2aaf81dbbb6909cf9d77cf57f4.tar.gz
tk-43554959e209cc2aaf81dbbb6909cf9d77cf57f4.tar.bz2
Backout previous commit: it causes many event-related test-failures in Tk test suite
-rw-r--r--library/scrlbar.tcl4
-rw-r--r--tests/scrollbar.test15
2 files changed, 0 insertions, 19 deletions
diff --git a/library/scrlbar.tcl b/library/scrlbar.tcl
index 2a70b97..e17442f 100644
--- a/library/scrlbar.tcl
+++ b/library/scrlbar.tcl
@@ -157,10 +157,6 @@ switch [tk windowingsystem] {
bind Scrollbar <Shift-4> {tk::ScrollByUnits %W h -5}
bind Scrollbar <Shift-5> {tk::ScrollByUnits %W h 5}
}
-} else {
- bind Scrollbar <MouseWheel> {
- tk::ScrollByUnits %W v [expr {- (%D/120)}]
- }
}
# tk::ScrollButtonDown --
# This procedure is invoked when a button is pressed in a scrollbar.
diff --git a/tests/scrollbar.test b/tests/scrollbar.test
index 8f92c93..c6a5a90 100644
--- a/tests/scrollbar.test
+++ b/tests/scrollbar.test
@@ -632,21 +632,6 @@ test scrollbar-9.1 {scrollbar widget vs hidden commands} {
list [winfo children .] [interp hidden]
} [list {} $l]
-test scrollbar-10.1 {<MouseWheel> event on scrollbar} -constraints win -setup {
- destroy .t .s
-} -body {
- pack [text .t -yscrollcommand {.s set}] -side left
- for {set i 1} {$i < 100} {incr i} {.t insert end "Line $i\n"}
- pack [scrollbar .s -command {.t yview}] -fill y -expand 1 -side left
- update
- focus -force .s
- event generate .s <MouseWheel> -delta -120
- after 200 {set eventprocessed 1} ; vwait eventprocessed
- .t index @0,0
-} -cleanup {
- destroy .t .s
-} -result {2.0}
-
catch {destroy .s}
catch {destroy .t}