diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-04-29 08:16:38 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-04-29 08:16:38 (GMT) |
| commit | 2394840bf0a69ff1aa91ecead70e6b2a4d716d1a (patch) | |
| tree | a071167cb16834595a30cb892fda90b867250e6c /generic/tkFocus.c | |
| parent | 79ddeebf264139cfbadae729b54646a2cfc8c092 (diff) | |
| parent | 64ac9dba8558f572db2bd2d6f908134796bf92c3 (diff) | |
| download | tk-bug_3512824.zip tk-bug_3512824.tar.gz tk-bug_3512824.tar.bz2 | |
merge trunkbug_3512824
Diffstat (limited to 'generic/tkFocus.c')
| -rw-r--r-- | generic/tkFocus.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/generic/tkFocus.c b/generic/tkFocus.c index 5f68d8b..2f50009 100644 --- a/generic/tkFocus.c +++ b/generic/tkFocus.c @@ -715,7 +715,7 @@ TkFocusKeyEvent( { DisplayFocusInfo *displayFocusPtr; TkWindow *focusWinPtr; - int focusX, focusY, vRootX, vRootY, vRootWidth, vRootHeight; + int focusX, focusY; displayFocusPtr = FindDisplayFocusInfo(winPtr->mainPtr, winPtr->dispPtr); focusWinPtr = displayFocusPtr->focusWinPtr; @@ -748,11 +748,9 @@ TkFocusKeyEvent( eventPtr->xkey.x = -1; eventPtr->xkey.y = -1; } else { - Tk_GetVRootGeometry((Tk_Window) focusWinPtr, &vRootX, &vRootY, - &vRootWidth, &vRootHeight); Tk_GetRootCoords((Tk_Window) focusWinPtr, &focusX, &focusY); - eventPtr->xkey.x = eventPtr->xkey.x_root - vRootX - focusX; - eventPtr->xkey.y = eventPtr->xkey.y_root - vRootY - focusY; + eventPtr->xkey.x = eventPtr->xkey.x_root - focusX; + eventPtr->xkey.y = eventPtr->xkey.y_root - focusY; } eventPtr->xkey.window = focusWinPtr->window; return focusWinPtr; |