diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2008-12-28 22:59:47 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2008-12-28 22:59:47 (GMT) |
| commit | 0a5d0843c169cfee7963b1feb685c3df23fed7c5 (patch) | |
| tree | 7cd3c101d33a8fda6d4de37149c484975c458fd3 /generic/tkEvent.c | |
| parent | 474bd9cda9c65a64819dd2992b1eb7cf3de2ca24 (diff) | |
| download | tk-0a5d0843c169cfee7963b1feb685c3df23fed7c5.zip tk-0a5d0843c169cfee7963b1feb685c3df23fed7c5.tar.gz tk-0a5d0843c169cfee7963b1feb685c3df23fed7c5.tar.bz2 | |
TIP#171 implementation - sanity for <MouseWheel> event handling!
Diffstat (limited to 'generic/tkEvent.c')
| -rw-r--r-- | generic/tkEvent.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/generic/tkEvent.c b/generic/tkEvent.c index e3f925d..13e1304 100644 --- a/generic/tkEvent.c +++ b/generic/tkEvent.c @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkEvent.c,v 1.37 2008/11/08 18:44:39 dkf Exp $ + * RCS: @(#) $Id: tkEvent.c,v 1.38 2008/12/28 22:59:47 dkf Exp $ */ #include "tkInt.h" @@ -247,16 +247,10 @@ InvokeFocusHandlers( } /* - * MouseWheel events are not focus specific on Mac OS X. + * Only key-related events are directed according to the focus. */ -#ifdef MAC_OSX_TK -#define FOCUS_DIRECTED_EVENT_MASK (KeyPressMask|KeyReleaseMask) -#else -#define FOCUS_DIRECTED_EVENT_MASK (KeyPressMask|KeyReleaseMask|MouseWheelMask) -#endif - - if (mask & FOCUS_DIRECTED_EVENT_MASK) { + if (mask & (KeyPressMask|KeyReleaseMask)) { (*winPtrPtr)->dispPtr->lastEventTime = eventPtr->xkey.time; *winPtrPtr = TkFocusKeyEvent(*winPtrPtr, eventPtr); if (*winPtrPtr == NULL) { |