summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs>2006-05-25 23:50:31 (GMT)
committerhobbs <hobbs>2006-05-25 23:50:31 (GMT)
commitdad351fc5952686c1d1a50db391ff35d8c998a22 (patch)
tree1892496b1901bf578569784261c48bb670a0d2e7
parenta0ff869af921c401c6c893abe8de8a6fb7a6cfbb (diff)
downloadtk-dad351fc5952686c1d1a50db391ff35d8c998a22.zip
tk-dad351fc5952686c1d1a50db391ff35d8c998a22.tar.gz
tk-dad351fc5952686c1d1a50db391ff35d8c998a22.tar.bz2
* win/tkWinMenu.c (TkWinMenuKeyObjCmd): get eventPtr after we know
the window is still alive. [AS bug 45987] [Bug 1236306]
-rw-r--r--win/tkWinMenu.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/win/tkWinMenu.c b/win/tkWinMenu.c
index bf9c751..5b037dd 100644
--- a/win/tkWinMenu.c
+++ b/win/tkWinMenu.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: tkWinMenu.c,v 1.47 2006/04/05 20:59:04 hobbs Exp $
+ * RCS: @(#) $Id: tkWinMenu.c,v 1.48 2006/05/25 23:50:31 hobbs Exp $
*/
#define OEMRESOURCE
@@ -1935,8 +1935,6 @@ TkWinMenuKeyObjCmd(clientData, interp, objc, objv)
return TCL_ERROR;
}
- eventPtr = TkpGetBindingXEvent(interp);
-
tkwin = Tk_NameToWindow(interp, Tcl_GetString(objv[1]),
Tk_MainWindow(interp));
@@ -1948,6 +1946,8 @@ TkWinMenuKeyObjCmd(clientData, interp, objc, objv)
return TCL_OK;
}
+ eventPtr = TkpGetBindingXEvent(interp);
+
winPtr = (TkWindow *)tkwin;
if (Tcl_GetIntFromObj(interp, objv[2], &i) != TCL_OK) {