summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2016-01-08 14:41:58 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2016-01-08 14:41:58 (GMT)
commit52598f831a2b67fd2feb6317fb7fca9828712cf5 (patch)
treed06483faa59f6920ff46bd9a8276adb77860ed69
parent93871e55e0916c42bc9d393fdba3814b1b45e285 (diff)
downloadtk-52598f831a2b67fd2feb6317fb7fca9828712cf5.zip
tk-52598f831a2b67fd2feb6317fb7fca9828712cf5.tar.gz
tk-52598f831a2b67fd2feb6317fb7fca9828712cf5.tar.bz2
(cherry-pick) 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 7cec556..4b25325 100644
--- a/library/scrlbar.tcl
+++ b/library/scrlbar.tcl
@@ -141,10 +141,6 @@ if {[tk windowingsystem] eq "aqua"} {
bind Scrollbar <Shift-Option-MouseWheel> {
tk::ScrollByUnits %W h [expr {-10 * (%D)}]
}
-} 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 10aa7d6..5d4334f 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}