summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordas <das>2004-02-23 12:03:18 (GMT)
committerdas <das>2004-02-23 12:03:18 (GMT)
commitcb7dc7e9a85fafa4069ea7d9befc2b187aff4be9 (patch)
treee7e2f14e7088f3372902118b71e98c487d7d8c20
parent424068d0e8dd6fcb04ef498c011262dd8466f3b5 (diff)
downloadtk-cb7dc7e9a85fafa4069ea7d9befc2b187aff4be9.zip
tk-cb7dc7e9a85fafa4069ea7d9befc2b187aff4be9.tar.gz
tk-cb7dc7e9a85fafa4069ea7d9befc2b187aff4be9.tar.bz2
* macosx/tkMacOSXMouseEvent.c: fixed modifiers for MouseWheel events.
* macosx/Wish.pbproj/project.pbxproj: * macosx/tkAboutDlg.r: changed year in copyright strings to 2004.
-rw-r--r--ChangeLog7
-rw-r--r--macosx/Wish.pbproj/project.pbxproj2
-rw-r--r--macosx/tkAboutDlg.r4
-rw-r--r--macosx/tkMacOSXMouseEvent.c1
4 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 1c74037..265ec73 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2004-02-23 Daniel Steffen <das@users.sourceforge.net>
+ * macosx/tkMacOSXMouseEvent.c: fixed modifiers for MouseWheel events.
+
+ * macosx/Wish.pbproj/project.pbxproj:
+ * macosx/tkAboutDlg.r: changed year in copyright strings to 2004.
+
+2004-02-23 Daniel Steffen <das@users.sourceforge.net>
+
* macosx/tkMacOSXDraw.c:
* macosx/tkMacOSXXStubs.c:
* xlib/ximage.c: fixed MacOSX XGetImage/XPutImage and related
diff --git a/macosx/Wish.pbproj/project.pbxproj b/macosx/Wish.pbproj/project.pbxproj
index fe917ed..b965269 100644
--- a/macosx/Wish.pbproj/project.pbxproj
+++ b/macosx/Wish.pbproj/project.pbxproj
@@ -3333,7 +3333,7 @@ MacOS X Port by Jim Ingham &lt;jingham@apple.com&gt; &amp; Ian Reid, Copyright Â
<key>CFBundleExecutable</key>
<string>Wish Shell</string>
<key>CFBundleGetInfoString</key>
- <string>Wish Shell 8.5, Copyright © 2003 Tcl Core Team.
+ <string>Wish Shell 8.5, Copyright © 2004 Tcl Core Team.
MacOS X Port by Jim Ingham &lt;jingham@apple.com&gt; &amp; Ian Reid, Copyright © 2001-2002, Apple Computer, Inc.</string>
<key>CFBundleIconFile</key>
<string>Wish.icns</string>
diff --git a/macosx/tkAboutDlg.r b/macosx/tkAboutDlg.r
index 2935951..5603645 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.4 2003/03/21 01:43:58 das Exp $
+ * RCS: @(#) $Id: tkAboutDlg.r,v 1.5 2004/02/23 12:03:20 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;