diff options
| author | das <das> | 2007-06-06 09:56:53 (GMT) |
|---|---|---|
| committer | das <das> | 2007-06-06 09:56:53 (GMT) |
| commit | ce5acb5ed756f94b279f428e363bb885ab971d01 (patch) | |
| tree | 0f31e25d4ca595727ac6e0b38a271fa4d9ad77bb /macosx/tkMacOSXMouseEvent.c | |
| parent | 14f8f936349132e0f6dc66230d2378d47d0968d7 (diff) | |
| download | tk-ce5acb5ed756f94b279f428e363bb885ab971d01.zip tk-ce5acb5ed756f94b279f428e363bb885ab971d01.tar.gz tk-ce5acb5ed756f94b279f428e363bb885ab971d01.tar.bz2 | |
* macosx/tkMacOSXMouseEvent.c (GenerateMouseWheelEvent): enable
processing of mousewheel events in background windows.
* macosx/tkMacOSXScrlbr.c: modernize checks for active/front window.
* macosx/tkMacOSXScale.c:
* macosx/tkMacOSXWm.c:
* macosx/tkMacOSXColor.c: factor out verbose #ifdef checks of
* macosx/tkMacOSXDraw.c: MAC_OS_X_VERSION_{MAX_ALLOWED,MIN_REQUIRED}
* macosx/tkMacOSXEntry.c: and runtime checks of kHIToolboxVersion into
* macosx/tkMacOSXEvent.c: new TK_{IF,ELSE,ENDIF}_MAC_OS_X macros.
* macosx/tkMacOSXInit.c:
* macosx/tkMacOSXInt.h:
* macosx/tkMacOSXWm.c:
* macosx/tkMacOSXDraw.c: factor out clip clearing in QD ports;
* macosx/tkMacOSXEntry.c: formatting cleanup.
Diffstat (limited to 'macosx/tkMacOSXMouseEvent.c')
| -rw-r--r-- | macosx/tkMacOSXMouseEvent.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/macosx/tkMacOSXMouseEvent.c b/macosx/tkMacOSXMouseEvent.c index a44118d..d557ffd 100644 --- a/macosx/tkMacOSXMouseEvent.c +++ b/macosx/tkMacOSXMouseEvent.c @@ -54,7 +54,7 @@ * software in accordance with the terms specified in this * license. * - * RCS: @(#) $Id: tkMacOSXMouseEvent.c,v 1.6.2.19 2007/05/09 12:57:46 das Exp $ + * RCS: @(#) $Id: tkMacOSXMouseEvent.c,v 1.6.2.20 2007/06/06 09:56:54 das Exp $ */ #include "tkMacOSXInt.h" @@ -600,19 +600,14 @@ GenerateMouseWheelEvent(MouseEventData * medPtr) TkWindow *winPtr; XEvent xEvent; - if ((!TkpIsWindowFloating(medPtr->whichWin) - && (medPtr->activeNonFloating != medPtr->whichWin))) { + dispPtr = TkGetDisplayList(); + rootwin = Tk_IdToWindow(dispPtr->display, medPtr->window); + if (rootwin == NULL) { tkwin = NULL; } else { - dispPtr = TkGetDisplayList(); - rootwin = Tk_IdToWindow(dispPtr->display, medPtr->window); - if (rootwin == NULL) { - tkwin = NULL; - } else { - tkwin = Tk_TopCoordsToWindow(rootwin, - medPtr->local.h, medPtr->local.v, - &xEvent.xbutton.x, &xEvent.xbutton.y); - } + tkwin = Tk_TopCoordsToWindow(rootwin, + medPtr->local.h, medPtr->local.v, + &xEvent.xbutton.x, &xEvent.xbutton.y); } /* |