diff options
| author | das <das> | 2004-02-17 07:17:17 (GMT) |
|---|---|---|
| committer | das <das> | 2004-02-17 07:17:17 (GMT) |
| commit | 064b39544a3a47938062584c49ae51439b08dc80 (patch) | |
| tree | 67b9bc56aad5c8f8f288c7a7ab5af743b2fe3dc8 /library | |
| parent | 53542ad7b74ce909809d9e560c25ab6d946d8f78 (diff) | |
| download | tk-064b39544a3a47938062584c49ae51439b08dc80.zip tk-064b39544a3a47938062584c49ae51439b08dc80.tar.gz tk-064b39544a3a47938062584c49ae51439b08dc80.tar.bz2 | |
* macosx/tkMacOSXMouseEvent.c: fixed modifiers for MouseWheel events.
* library/listbox.tcl:
* library/text.tcl:
* library/scrlbar.tcl: on Mac OS, add bindings for MouseWheel with
modifiers, according to platform convention:
Option increases scrolling speed 10 fold; Space scrolls horizontally.
* macosx/Wish.pbproj/project.pbxproj:
* macosx/tkAboutDlg.r: changed year in copyright strings to 2004.
Diffstat (limited to 'library')
| -rw-r--r-- | library/listbox.tcl | 11 | ||||
| -rw-r--r-- | library/scrlbar.tcl | 17 | ||||
| -rw-r--r-- | library/text.tcl | 11 |
3 files changed, 36 insertions, 3 deletions
diff --git a/library/listbox.tcl b/library/listbox.tcl index dcc3cde..b2abe11 100644 --- a/library/listbox.tcl +++ b/library/listbox.tcl @@ -3,7 +3,7 @@ # This file defines the default bindings for Tk listbox widgets # and provides procedures that help in implementing those bindings. # -# RCS: @(#) $Id: listbox.tcl,v 1.13.2.1 2004/02/16 23:09:25 wolfsuit Exp $ +# RCS: @(#) $Id: listbox.tcl,v 1.13.2.2 2004/02/17 07:17:17 das Exp $ # # Copyright (c) 1994 The Regents of the University of California. # Copyright (c) 1994-1995 Sun Microsystems, Inc. @@ -184,6 +184,15 @@ if {[string equal [tk windowingsystem] "classic"] bind Listbox <MouseWheel> { %W yview scroll [expr {- (%D)}] units } + bind Listbox <Option-MouseWheel> { + %W yview scroll [expr {-10 * (%D)}] units + } + bind Listbox <Shift-MouseWheel> { + %W xview scroll [expr {- (%D)}] units + } + bind Listbox <Shift-Option-MouseWheel> { + %W xview scroll [expr {-10 * (%D)}] units + } } else { bind Listbox <MouseWheel> { %W yview scroll [expr {- (%D / 120) * 4}] units diff --git a/library/scrlbar.tcl b/library/scrlbar.tcl index b31686d..49cd1b6 100644 --- a/library/scrlbar.tcl +++ b/library/scrlbar.tcl @@ -3,7 +3,7 @@ # This file defines the default bindings for Tk scrollbar widgets. # It also provides procedures that help in implementing the bindings. # -# RCS: @(#) $Id: scrlbar.tcl,v 1.10 2002/08/31 06:12:28 das Exp $ +# RCS: @(#) $Id: scrlbar.tcl,v 1.10.2.1 2004/02/17 07:17:17 das Exp $ # # Copyright (c) 1994 The Regents of the University of California. # Copyright (c) 1994-1996 Sun Microsystems, Inc. @@ -130,6 +130,21 @@ bind Scrollbar <End> { tk::ScrollToPos %W 1 } } +if {[string equal [tk windowingsystem] "classic"] + || [string equal [tk windowingsystem] "aqua"]} { + bind Scrollbar <MouseWheel> { + tk::ScrollByUnits %W v [expr {- (%D)}] + } + bind Scrollbar <Option-MouseWheel> { + tk::ScrollByUnits %W v [expr {-10 * (%D)}] + } + bind Scrollbar <Shift-MouseWheel> { + tk::ScrollByUnits %W h [expr {- (%D)}] + } + bind Scrollbar <Shift-Option-MouseWheel> { + tk::ScrollByUnits %W h [expr {-10 * (%D)}] + } +} # tk::ScrollButtonDown -- # This procedure is invoked when a button is pressed in a scrollbar. # It changes the way the scrollbar is displayed and takes actions diff --git a/library/text.tcl b/library/text.tcl index 85d83f1..8509892 100644 --- a/library/text.tcl +++ b/library/text.tcl @@ -3,7 +3,7 @@ # This file defines the default bindings for Tk text widgets and provides # procedures that help in implementing the bindings. # -# RCS: @(#) $Id: text.tcl,v 1.24.2.1 2004/02/16 23:09:25 wolfsuit Exp $ +# RCS: @(#) $Id: text.tcl,v 1.24.2.2 2004/02/17 07:17:17 das Exp $ # # Copyright (c) 1992-1994 The Regents of the University of California. # Copyright (c) 1994-1997 Sun Microsystems, Inc. @@ -463,6 +463,15 @@ if {[string equal [tk windowingsystem] "classic"] bind Text <MouseWheel> { %W yview scroll [expr {- (%D)}] units } + bind Text <Option-MouseWheel> { + %W yview scroll [expr {-10 * (%D)}] units + } + bind Text <Shift-MouseWheel> { + %W xview scroll [expr {- (%D)}] units + } + bind Text <Shift-Option-MouseWheel> { + %W xview scroll [expr {-10 * (%D)}] units + } } else { bind Text <MouseWheel> { %W yview scroll [expr {- (%D / 120) * 4}] units |