summaryrefslogtreecommitdiffstats
path: root/macosx/tkMacOSXMouseEvent.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2024-10-25 21:06:25 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2024-10-25 21:06:25 (GMT)
commit0d5336db012f45753abace489f18f0ca299c6961 (patch)
treeb1bf3280a9046df99226158978502eeb26f5b0a3 /macosx/tkMacOSXMouseEvent.c
parente97381a6d921de403516d5b761539a450f4af83c (diff)
parent1320b8a2a9c1269a345d44d673a7a35707fbbe9c (diff)
downloadtk-core-tip-626.zip
tk-core-tip-626.tar.gz
tk-core-tip-626.tar.bz2
Merge 9.0core-tip-626
Diffstat (limited to 'macosx/tkMacOSXMouseEvent.c')
-rw-r--r--macosx/tkMacOSXMouseEvent.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/macosx/tkMacOSXMouseEvent.c b/macosx/tkMacOSXMouseEvent.c
index 83d2cd2..062a125 100644
--- a/macosx/tkMacOSXMouseEvent.c
+++ b/macosx/tkMacOSXMouseEvent.c
@@ -504,8 +504,9 @@ enum {
state |= Tk_GetButtonMask(Button1);
}
if (eventType == NSMouseEntered) {
- Tk_UpdatePointer((Tk_Window) [NSApp tkPointerWindow],
- global.x, global.y, state);
+ Tk_Window new_win = Tk_CoordsToWindow(global.x, global.y,
+ (Tk_Window) [NSApp tkPointerWindow]);
+ Tk_UpdatePointer(new_win, global.x, global.y, state);
} else if (eventType == NSMouseExited) {
if ([NSApp tkDragTarget]) {
Tk_UpdatePointer((Tk_Window) [NSApp tkDragTarget],
@@ -883,9 +884,9 @@ TkpWarpPointer(
CGWarpMouseCursorPosition(pt);
if (dispPtr->warpWindow) {
- TkGenerateButtonEventForXPointer(Tk_WindowId(dispPtr->warpWindow));
+ TkGenerateButtonEventForXPointer(Tk_WindowId(dispPtr->warpWindow));
} else {
- TkGenerateButtonEventForXPointer(None);
+ TkGenerateButtonEventForXPointer(None);
}
}