diff options
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkCmds.c | 12 | ||||
| -rw-r--r-- | generic/tkTest.c | 16 |
2 files changed, 14 insertions, 14 deletions
diff --git a/generic/tkCmds.c b/generic/tkCmds.c index 34e2867..e705109 100644 --- a/generic/tkCmds.c +++ b/generic/tkCmds.c @@ -452,7 +452,7 @@ Tk_LowerCmd(clientData, interp, argc, argv) int argc; /* Number of arguments. */ char **argv; /* Argument strings. */ { - Tk_Window main = (Tk_Window) clientData; + Tk_Window mainwin = (Tk_Window) clientData; Tk_Window tkwin, other; if ((argc != 2) && (argc != 3)) { @@ -461,14 +461,14 @@ Tk_LowerCmd(clientData, interp, argc, argv) return TCL_ERROR; } - tkwin = Tk_NameToWindow(interp, argv[1], main); + tkwin = Tk_NameToWindow(interp, argv[1], mainwin); if (tkwin == NULL) { return TCL_ERROR; } if (argc == 2) { other = NULL; } else { - other = Tk_NameToWindow(interp, argv[2], main); + other = Tk_NameToWindow(interp, argv[2], mainwin); if (other == NULL) { return TCL_ERROR; } @@ -507,7 +507,7 @@ Tk_RaiseCmd(clientData, interp, argc, argv) int argc; /* Number of arguments. */ char **argv; /* Argument strings. */ { - Tk_Window main = (Tk_Window) clientData; + Tk_Window mainwin = (Tk_Window) clientData; Tk_Window tkwin, other; if ((argc != 2) && (argc != 3)) { @@ -516,14 +516,14 @@ Tk_RaiseCmd(clientData, interp, argc, argv) return TCL_ERROR; } - tkwin = Tk_NameToWindow(interp, argv[1], main); + tkwin = Tk_NameToWindow(interp, argv[1], mainwin); if (tkwin == NULL) { return TCL_ERROR; } if (argc == 2) { other = NULL; } else { - other = Tk_NameToWindow(interp, argv[2], main); + other = Tk_NameToWindow(interp, argv[2], mainwin); if (other == NULL) { return TCL_ERROR; } diff --git a/generic/tkTest.c b/generic/tkTest.c index dab43d0..dbf758d 100644 --- a/generic/tkTest.c +++ b/generic/tkTest.c @@ -734,12 +734,12 @@ TestmakeexistCmd(clientData, interp, argc, argv) int argc; /* Number of arguments. */ char **argv; /* Argument strings. */ { - Tk_Window main = (Tk_Window) clientData; + Tk_Window mainwin = (Tk_Window) clientData; int i; Tk_Window tkwin; for (i = 1; i < argc; i++) { - tkwin = Tk_NameToWindow(interp, argv[i], main); + tkwin = Tk_NameToWindow(interp, argv[i], mainwin); if (tkwin == NULL) { return TCL_ERROR; } @@ -776,7 +776,7 @@ TestmenubarCmd(clientData, interp, argc, argv) char **argv; /* Argument strings. */ { #ifdef __UNIX__ - Tk_Window main = (Tk_Window) clientData; + Tk_Window mainwin = (Tk_Window) clientData; Tk_Window tkwin, menubar; if (argc < 2) { @@ -791,14 +791,14 @@ TestmenubarCmd(clientData, interp, argc, argv) "window toplevel menubar\"", (char *) NULL); return TCL_ERROR; } - tkwin = Tk_NameToWindow(interp, argv[2], main); + tkwin = Tk_NameToWindow(interp, argv[2], mainwin); if (tkwin == NULL) { return TCL_ERROR; } if (argv[3][0] == 0) { TkUnixSetMenubar(tkwin, NULL); } else { - menubar = Tk_NameToWindow(interp, argv[3], main); + menubar = Tk_NameToWindow(interp, argv[3], mainwin); if (menubar == NULL) { return TCL_ERROR; } @@ -927,7 +927,7 @@ TestpropCmd(clientData, interp, argc, argv) int argc; /* Number of arguments. */ char **argv; /* Argument strings. */ { - Tk_Window main = (Tk_Window) clientData; + Tk_Window mainwin = (Tk_Window) clientData; int result, actualFormat; unsigned long bytesAfter, length, value; Atom actualType, propName; @@ -942,9 +942,9 @@ TestpropCmd(clientData, interp, argc, argv) } w = strtoul(argv[1], &end, 0); - propName = Tk_InternAtom(main, argv[2]); + propName = Tk_InternAtom(mainwin, argv[2]); property = NULL; - result = XGetWindowProperty(Tk_Display(main), + result = XGetWindowProperty(Tk_Display(mainwin), w, propName, 0, 100000, False, AnyPropertyType, &actualType, &actualFormat, &length, &bytesAfter, (unsigned char **) &property); |