diff options
| -rw-r--r-- | generic/tkBind.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/generic/tkBind.c b/generic/tkBind.c index bb37b00..3194dd1 100644 --- a/generic/tkBind.c +++ b/generic/tkBind.c @@ -3101,9 +3101,9 @@ GetAllVirtualEvents(interp, vetPtr) *--------------------------------------------------------------------------- */ static int -HandleEventGenerate(interp, main, argc, argv) +HandleEventGenerate(interp, mainwin, argc, argv) Tcl_Interp *interp; /* Interp for error messages and name lookup. */ - Tk_Window main; /* Main window associated with interp. */ + Tk_Window mainwin; /* Main window associated with interp. */ int argc; /* Number of arguments. */ char **argv; /* Argument strings. */ { @@ -3116,7 +3116,7 @@ HandleEventGenerate(interp, main, argc, argv) XEvent event; if (argv[0][0] == '.') { - tkwin = Tk_NameToWindow(interp, argv[0], main); + tkwin = Tk_NameToWindow(interp, argv[0], mainwin); if (tkwin == NULL) { return TCL_ERROR; } @@ -3126,8 +3126,8 @@ HandleEventGenerate(interp, main, argc, argv) argv[0], "\"", (char *) NULL); return TCL_ERROR; } - tkwin = Tk_IdToWindow(Tk_Display(main), (Window) i); - if ((tkwin == NULL) || (((TkWindow *) main)->mainPtr + tkwin = Tk_IdToWindow(Tk_Display(mainwin), (Window) i); + if ((tkwin == NULL) || (((TkWindow *) mainwin)->mainPtr != ((TkWindow *) tkwin)->mainPtr)) { Tcl_AppendResult(interp, "window id \"", argv[0], "\" doesn't exist in this application", (char *) NULL); @@ -3238,7 +3238,7 @@ HandleEventGenerate(interp, main, argc, argv) } } else if (strcmp(field, "-above") == 0) { if (value[0] == '.') { - tkwin2 = Tk_NameToWindow(interp, value, main); + tkwin2 = Tk_NameToWindow(interp, value, mainwin); if (tkwin2 == NULL) { return TCL_ERROR; } @@ -3397,7 +3397,7 @@ HandleEventGenerate(interp, main, argc, argv) } } else if (strcmp(field, "-root") == 0) { if (value[0] == '.') { - tkwin2 = Tk_NameToWindow(interp, value, main); + tkwin2 = Tk_NameToWindow(interp, value, mainwin); if (tkwin2 == NULL) { return TCL_ERROR; } @@ -3471,7 +3471,7 @@ HandleEventGenerate(interp, main, argc, argv) } } else if (strcmp(field, "-subwindow") == 0) { if (value[0] == '.') { - tkwin2 = Tk_NameToWindow(interp, value, main); + tkwin2 = Tk_NameToWindow(interp, value, mainwin); if (tkwin2 == NULL) { return TCL_ERROR; } @@ -3509,7 +3509,7 @@ HandleEventGenerate(interp, main, argc, argv) } } else if (strcmp(field, "-window") == 0) { if (value[0] == '.') { - tkwin2 = Tk_NameToWindow(interp, value, main); + tkwin2 = Tk_NameToWindow(interp, value, mainwin); if (tkwin2 == NULL) { return TCL_ERROR; } |