summaryrefslogtreecommitdiffstats
path: root/macosx/tkMacOSXCarbonEvents.c
diff options
context:
space:
mode:
authordas <das>2005-12-13 03:44:41 (GMT)
committerdas <das>2005-12-13 03:44:41 (GMT)
commitc97f485feb8a8de6050fa13f72a5a808cc6f05d0 (patch)
treefbb79b1fd0e2a596050d2b087290c6b5ecf7a3b5 /macosx/tkMacOSXCarbonEvents.c
parentd5a443172ee410e009c7e6d7769f8b774d74d3e0 (diff)
downloadtk-c97f485feb8a8de6050fa13f72a5a808cc6f05d0.zip
tk-c97f485feb8a8de6050fa13f72a5a808cc6f05d0.tar.gz
tk-c97f485feb8a8de6050fa13f72a5a808cc6f05d0.tar.bz2
* library/demos/cscroll.tcl: add MouseWheel bindings for aqua.
* macosx/tkMacOSXCarbonEvents.c (TkMacOSXInitCarbonEvents): * macosx/tkMacOSXMouseEvent.c (TkMacOSXProcessMouseEvent, GenerateMouseWheelEvent): add support for kEventMouseScroll events (smooth mouse wheel scrolling from mighty mouse or scrolling trackpad) by handling kEventMouseWheelMoved on application target as well as on dispatcher, in order to pick up synthesized MouseWheel events from HIObject handler (c.f. QA1453); add support for horizontal scrolling events by generating MouseWheel XEvent with Shift modifier.
Diffstat (limited to 'macosx/tkMacOSXCarbonEvents.c')
-rw-r--r--macosx/tkMacOSXCarbonEvents.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/macosx/tkMacOSXCarbonEvents.c b/macosx/tkMacOSXCarbonEvents.c
index fbab4a8..45be898 100644
--- a/macosx/tkMacOSXCarbonEvents.c
+++ b/macosx/tkMacOSXCarbonEvents.c
@@ -60,7 +60,7 @@
* software in accordance with the terms specified in this
* license.
*
- * RCS: @(#) $Id: tkMacOSXCarbonEvents.c,v 1.3.2.7 2005/12/01 02:15:46 das Exp $
+ * RCS: @(#) $Id: tkMacOSXCarbonEvents.c,v 1.3.2.8 2005/12/13 03:44:42 das Exp $
*/
#include "tkInt.h"
@@ -193,6 +193,7 @@ TkMacOSXInitCarbonEvents (
{kEventClassMenu, kEventMenuBeginTracking},
{kEventClassMenu, kEventMenuEndTracking},
{kEventClassCommand, kEventCommandProcess},
+ {kEventClassMouse, kEventMouseWheelMoved},
{kEventClassWindow, kEventWindowExpanded},
{kEventClassApplication, kEventAppHidden},
{kEventClassApplication, kEventAppShown},
@@ -231,6 +232,7 @@ TkMacOSXInitCarbonEvents (
_TraceEventByName(CFSTR("kEventMouseDown"));
_TraceEventByName(CFSTR("kEventMouseUp"));
_TraceEventByName(CFSTR("kEventMouseWheelMoved"));
+ _TraceEventByName(CFSTR("kEventMouseScroll"));
_TraceEventByName(CFSTR("kEventWindowUpdate"));
_TraceEventByName(CFSTR("kEventWindowActivated"));
_TraceEventByName(CFSTR("kEventWindowDeactivated"));