diff options
| author | das <das> | 2006-04-28 06:02:47 (GMT) |
|---|---|---|
| committer | das <das> | 2006-04-28 06:02:47 (GMT) |
| commit | 37574f162488e058bcba4d8378c94a18716b7af1 (patch) | |
| tree | dbf40a74ecf59b8ccec931d28b36eb0dfdafb1a1 /macosx/tkMacOSXMenus.c | |
| parent | c5df89036d559ebb962065ca285fa46f6828db56 (diff) | |
| download | tk-37574f162488e058bcba4d8378c94a18716b7af1.zip tk-37574f162488e058bcba4d8378c94a18716b7af1.tar.gz tk-37574f162488e058bcba4d8378c94a18716b7af1.tar.bz2 | |
* macosx/tkMacOSXWm.c (TkWmMapWindow, InitialWindowBounds): fix use of
potentially stale window position in initial configure event on first
map of a window. [Bug 1476443]
(TkMacOSXWindowOffset): use modern GetWindowStructureWidths API.
* macosx/tkMacOSXInt.h:
* macosx/tkMacOSXMouseEvent.c (TkGenerateButtonEventForXPointer): new
internal function to generate button events for current pointer
directly, without requiring prior call to XQueryPointer().
* macosx/tkMacOSXMouseEvent.c (XQueryPointer): implement return of
window-local pointer position.
* macosx/tkMacOSXInt.h: use improvements above to avoid calls to
* macosx/tkMacOSXKeyEvent.c: GlobalToLocal() when the current port might
* macosx/tkMacOSXMenu.c: not be set correctly. May fix [Bug 1243318]
* macosx/tkMacOSXMenus.c:
* macosx/tkMacOSXScale.c:
* macosx/tkMacOSXScrlbr.c:
* tkAboutDlg.r: update copyright.
* macosx/tkMacOSXDebug.h: sync #includes with core-8-4-branch.
* macosx/tkMacOSXEvent.h:
* macosx/tkMacOSXFont.h:
Diffstat (limited to 'macosx/tkMacOSXMenus.c')
| -rw-r--r-- | macosx/tkMacOSXMenus.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/macosx/tkMacOSXMenus.c b/macosx/tkMacOSXMenus.c index 95702a5..ab1926e 100644 --- a/macosx/tkMacOSXMenus.c +++ b/macosx/tkMacOSXMenus.c @@ -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: tkMacOSXMenus.c,v 1.10 2006/03/24 14:58:01 das Exp $ + * RCS: @(#) $Id: tkMacOSXMenus.c,v 1.11 2006/04/28 06:02:49 das Exp $ */ #include "tkMacOSXInt.h" @@ -219,7 +219,7 @@ GenerateEditEvent( int flag) { XVirtualEvent event; - Point where; + int x, y; Tk_Window tkwin; Window window; TkDisplay *dispPtr; @@ -242,12 +242,8 @@ GenerateEditEvent( event.time = TkpGetMS(); XQueryPointer(NULL, None, NULL, NULL, - &event.x_root, &event.y_root, NULL, NULL, &event.state); - where.h = event.x_root; - where.v = event.y_root; - GlobalToLocal(&where); - tkwin = Tk_TopCoordsToWindow(tkwin, where.h, where.v, - &event.x, &event.y); + &event.x_root, &event.y_root, &x, &y, &event.state); + tkwin = Tk_TopCoordsToWindow(tkwin, x, y, &event.x, &event.y); event.same_screen = true; event.user_data = NULL; |