diff options
| author | das <das> | 2004-02-17 07:17:17 (GMT) |
|---|---|---|
| committer | das <das> | 2004-02-17 07:17:17 (GMT) |
| commit | f72de34dddf63ca9a18d6c35b232d85f9d62dc78 (patch) | |
| tree | 67b9bc56aad5c8f8f288c7a7ab5af743b2fe3dc8 /macosx | |
| parent | adac653251aa610ad4023bceb7f2ed28ab481b4f (diff) | |
| download | tk-f72de34dddf63ca9a18d6c35b232d85f9d62dc78.zip tk-f72de34dddf63ca9a18d6c35b232d85f9d62dc78.tar.gz tk-f72de34dddf63ca9a18d6c35b232d85f9d62dc78.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 'macosx')
| -rw-r--r-- | macosx/Wish.pbproj/project.pbxproj | 2 | ||||
| -rw-r--r-- | macosx/tkAboutDlg.r | 4 | ||||
| -rw-r--r-- | macosx/tkMacOSXMouseEvent.c | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/macosx/Wish.pbproj/project.pbxproj b/macosx/Wish.pbproj/project.pbxproj index 0a64e04..0d7992c 100644 --- a/macosx/Wish.pbproj/project.pbxproj +++ b/macosx/Wish.pbproj/project.pbxproj @@ -1552,7 +1552,7 @@ <key>CFBundleExecutable</key> <string>Tk</string> <key>CFBundleGetInfoString</key> - <string>Tk Library 8.4, Copyright © 2003 Tcl Core Team. + <string>Tk Library 8.4, Copyright © 2004 Tcl Core Team. MacOS X Port by Jim Ingham <jingham@apple.com> & Ian Reid, Copyright © 2001-2002, Apple Computer, Inc.</string> <key>CFBundleIconFile</key> <string></string> diff --git a/macosx/tkAboutDlg.r b/macosx/tkAboutDlg.r index aebdac7..29860ec 100644 --- a/macosx/tkAboutDlg.r +++ b/macosx/tkAboutDlg.r @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkAboutDlg.r,v 1.3.2.1 2003/05/13 02:42:57 das Exp $ + * RCS: @(#) $Id: tkAboutDlg.r,v 1.3.2.2 2004/02/17 07:17:18 das Exp $ */ /* @@ -48,7 +48,7 @@ resource 'DITL' (128, "About Box", purgeable) { {200, 147, 220, 217}, Button {enabled, "Ok"}, { 20, 108, 180, 344}, StaticText {disabled, "Tcl " TCL_PATCH_LEVEL " & Tk " TK_PATCH_LEVEL "\n\n" - "© 2003 Tcl Core Team." "\n\n" + "© 2004 Tcl Core Team." "\n\n" "Jim Ingham & Ian Reid" "\n" "© 2001-2002 Apple Computer, Inc." "\n\n" "Jim Ingham & Ray Johnson" "\n" diff --git a/macosx/tkMacOSXMouseEvent.c b/macosx/tkMacOSXMouseEvent.c index 150519c..cab8a93 100644 --- a/macosx/tkMacOSXMouseEvent.c +++ b/macosx/tkMacOSXMouseEvent.c @@ -608,6 +608,7 @@ GenerateMouseWheelEvent(MouseEventData * medPtr) winPtr = ( TkWindow *)tkwin; xEvent.type = MouseWheelEvent; xEvent.xkey.keycode = medPtr->delta; + xEvent.xbutton.state = TkMacOSXButtonKeyState(); xEvent.xany.serial = LastKnownRequestProcessed(winPtr->display); xEvent.xany.send_event = false; xEvent.xany.display = winPtr->display; |