diff options
102 files changed, 491 insertions, 450 deletions
diff --git a/generic/tkBind.c b/generic/tkBind.c index 207ceae..57799bf 100644 --- a/generic/tkBind.c +++ b/generic/tkBind.c @@ -3938,7 +3938,7 @@ HandleEventGenerate( mainPtr = (TkWindow *) mainWin; if (!tkwin || mainPtr->mainPtr != ((TkWindow *) tkwin)->mainPtr) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "window id \"%s\" doesn't exist in this application", + "window id \"%s\" does not exist in this application", Tcl_GetString(objv[0]))); Tcl_SetErrorCode(interp, "TK", "LOOKUP", "WINDOW", Tcl_GetString(objv[0]), (char *)NULL); return TCL_ERROR; @@ -4419,7 +4419,7 @@ HandleEventGenerate( if (badOpt) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "%s event doesn't accept \"%s\" option", name, Tcl_GetString(optionPtr))); + "%s event does not accept \"%s\" option", name, Tcl_GetString(optionPtr))); Tcl_SetErrorCode(interp, "TK", "EVENT", "BAD_OPTION", (char *)NULL); return TCL_ERROR; } diff --git a/generic/tkBitmap.c b/generic/tkBitmap.c index edd36ad..f3c992f 100644 --- a/generic/tkBitmap.c +++ b/generic/tkBitmap.c @@ -349,7 +349,7 @@ GetBitmap( if (Tcl_IsSafe(interp)) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "can't specify bitmap with '@' in a safe interpreter", + "cannot specify bitmap with '@' in a safe interpreter", TCL_INDEX_NONE)); Tcl_SetErrorCode(interp, "TK", "SAFE", "BITMAP_FILE", (char *)NULL); goto error; diff --git a/generic/tkBusy.c b/generic/tkBusy.c index 65e1fc7..48131f9 100644 --- a/generic/tkBusy.c +++ b/generic/tkBusy.c @@ -697,7 +697,7 @@ GetBusy( hPtr = Tcl_FindHashEntry(busyTablePtr, tkwin); if (hPtr == NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't find busy window \"%s\"", Tcl_GetString(windowObj))); + "cannot find busy window \"%s\"", Tcl_GetString(windowObj))); Tcl_SetErrorCode(interp, "TK", "LOOKUP", "BUSY", Tcl_GetString(windowObj), (char *)NULL); return NULL; diff --git a/generic/tkCanvBmap.c b/generic/tkCanvBmap.c index 6915282..02998a2 100644 --- a/generic/tkCanvBmap.c +++ b/generic/tkCanvBmap.c @@ -982,7 +982,7 @@ BitmapToPostscript( if (width > 60000) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "can't generate Postscript for bitmaps more than 60000" + "cannot generate Postscript for bitmaps more than 60000" " pixels wide", TCL_INDEX_NONE)); Tcl_SetErrorCode(interp, "TK", "CANVAS", "PS", "MEMLIMIT", (char *)NULL); goto error; diff --git a/generic/tkCanvPs.c b/generic/tkCanvPs.c index 856bb4e..03f8e88 100644 --- a/generic/tkCanvPs.c +++ b/generic/tkCanvPs.c @@ -337,7 +337,7 @@ TkCanvPostscriptObjCmd( if (psInfo.channelName != NULL) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "can't specify both -file and -channel", TCL_INDEX_NONE)); + "cannot specify both -file and -channel", TCL_INDEX_NONE)); Tcl_SetErrorCode(interp, "TK", "CANVAS", "PS", "USAGE", (char *)NULL); result = TCL_ERROR; goto cleanup; @@ -350,7 +350,7 @@ TkCanvPostscriptObjCmd( if (Tcl_IsSafe(interp)) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "can't specify -file in a safe interpreter", TCL_INDEX_NONE)); + "cannot specify -file in a safe interpreter", TCL_INDEX_NONE)); Tcl_SetErrorCode(interp, "TK", "SAFE", "PS_FILE", (char *)NULL); result = TCL_ERROR; goto cleanup; @@ -1361,7 +1361,7 @@ TkPostscriptImage( if (bytesPerLine > 60000) { Tcl_ResetResult(interp); Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't generate Postscript for images more than %d pixels wide", + "cannot generate Postscript for images more than %d pixels wide", maxWidth)); Tcl_SetErrorCode(interp, "TK", "CANVAS", "PS", "MEMLIMIT", (char *)NULL); ckfree(cdata.colors); @@ -1547,7 +1547,7 @@ Tk_PostscriptPhoto( if (bytesPerLine > 60000) { Tcl_ResetResult(interp); Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't generate Postscript for images more than %d pixels wide", + "cannot generate Postscript for images more than %d pixels wide", maxWidth)); Tcl_SetErrorCode(interp, "TK", "CANVAS", "PS", "MEMLIMIT", (char *)NULL); return TCL_ERROR; diff --git a/generic/tkCanvWind.c b/generic/tkCanvWind.c index 1187613..9d4cdcf 100644 --- a/generic/tkCanvWind.c +++ b/generic/tkCanvWind.c @@ -376,7 +376,7 @@ ConfigureWinItem( badWindow: Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't use %s in a window item of this canvas", + "cannot use %s in a window item of this canvas", Tk_PathName(winItemPtr->tkwin))); Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "HIERARCHY", (char *)NULL); winItemPtr->tkwin = NULL; diff --git a/generic/tkCanvas.c b/generic/tkCanvas.c index 879cf27..598b189 100644 --- a/generic/tkCanvas.c +++ b/generic/tkCanvas.c @@ -930,7 +930,7 @@ CanvasWidgetCmd( if (object == 0) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "item \"%s\" doesn't exist", Tcl_GetString(objv[2]))); + "item \"%s\" does not exist", Tcl_GetString(objv[2]))); Tcl_SetErrorCode(interp, "TK", "LOOKUP", "CANVAS_ITEM", Tcl_GetString(objv[2]), (char *)NULL); result = TCL_ERROR; @@ -1538,7 +1538,7 @@ CanvasWidgetCmd( } if (itemPtr == NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't find an indexable item \"%s\"", + "cannot find an indexable item \"%s\"", Tcl_GetString(objv[2]))); Tcl_SetErrorCode(interp, "TK", "CANVAS", "INDEXABLE_ITEM", (char *)NULL); result = TCL_ERROR; @@ -1940,7 +1940,7 @@ CanvasWidgetCmd( } if (itemPtr == NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't find an indexable and selectable item \"%s\"", + "cannot find an indexable and selectable item \"%s\"", Tcl_GetString(objv[3]))); Tcl_SetErrorCode(interp, "TK", "CANVAS", "SELECTABLE_ITEM", (char *)NULL); @@ -4737,7 +4737,7 @@ FindItems( } if (halo < 0.0) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't have negative halo value \"%f\"", halo)); + "cannot have negative halo value \"%f\"", halo)); return TCL_ERROR; } } else { diff --git a/generic/tkCmds.c b/generic/tkCmds.c index 00f8a09..ba113b2 100644 --- a/generic/tkCmds.c +++ b/generic/tkCmds.c @@ -558,11 +558,11 @@ Tk_LowerObjCmd( if (Tk_RestackWindow(tkwin, Below, other) != TCL_OK) { if (other) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't lower \"%s\" below \"%s\"", + "cannot lower \"%s\" below \"%s\"", Tcl_GetString(objv[1]), Tcl_GetString(objv[2]))); } else { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't lower \"%s\" to bottom", Tcl_GetString(objv[1]))); + "cannot lower \"%s\" to bottom", Tcl_GetString(objv[1]))); } Tcl_SetErrorCode(interp, "TK", "RESTACK", "LOWER", (char *)NULL); return TCL_ERROR; @@ -617,11 +617,11 @@ Tk_RaiseObjCmd( if (Tk_RestackWindow(tkwin, Above, other) != TCL_OK) { if (other) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't raise \"%s\" above \"%s\"", + "cannot raise \"%s\" above \"%s\"", Tcl_GetString(objv[1]), Tcl_GetString(objv[2]))); } else { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't raise \"%s\" to top", Tcl_GetString(objv[1]))); + "cannot raise \"%s\" to top", Tcl_GetString(objv[1]))); } Tcl_SetErrorCode(interp, "TK", "RESTACK", "RAISE", (char *)NULL); return TCL_ERROR; @@ -1678,7 +1678,7 @@ Tk_WinfoObjCmd( if ((winPtr == NULL) || (winPtr->mainPtr != ((TkWindow *) tkwin)->mainPtr)) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "window id \"%s\" doesn't exist in this application", + "window id \"%s\" does not exist in this application", string)); Tcl_SetErrorCode(interp, "TK", "LOOKUP", "WINDOW", string, (char *)NULL); return TCL_ERROR; @@ -1817,7 +1817,7 @@ Tk_WinfoObjCmd( &templ, &count); if (visInfoPtr == NULL) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "can't find any visuals for screen", TCL_INDEX_NONE)); + "cannot find any visuals for screen", TCL_INDEX_NONE)); Tcl_SetErrorCode(interp, "TK", "VISUAL", "NONE", (char *)NULL); return TCL_ERROR; } @@ -1936,7 +1936,7 @@ TkDeadAppObjCmd( Tcl_Obj *const objv[]) /* Argument strings. */ { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't invoke \"%s\" command: application has been destroyed", + "cannot invoke \"%s\" command: application has been destroyed", Tcl_GetString(objv[0]))); return TCL_ERROR; } diff --git a/generic/tkFont.c b/generic/tkFont.c index 6a90add..8acc965 100644 --- a/generic/tkFont.c +++ b/generic/tkFont.c @@ -633,7 +633,7 @@ Tk_FontObjCmd( } if ((namedHashPtr == NULL) || nfPtr->deletePending) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "named font \"%s\" doesn't exist", string)); + "named font \"%s\" does not exist", string)); Tcl_SetErrorCode(interp, "TK", "LOOKUP", "FONT", string, NULL); return TCL_ERROR; } @@ -1028,7 +1028,7 @@ TkDeleteNamedFont( if (namedHashPtr == NULL) { if (interp) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "named font \"%s\" doesn't exist", name)); + "named font \"%s\" does not exist", name)); Tcl_SetErrorCode(interp, "TK", "LOOKUP", "FONT", name, NULL); } return TCL_ERROR; @@ -3743,7 +3743,7 @@ ParseFontNameObj( || (objc < 1)) { if (interp != NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "font \"%s\" doesn't exist", string)); + "font \"%s\" does not exist", string)); Tcl_SetErrorCode(interp, "TK", "LOOKUP", "FONT", string, NULL); } return TCL_ERROR; diff --git a/generic/tkFrame.c b/generic/tkFrame.c index d49292b..1a1738a 100644 --- a/generic/tkFrame.c +++ b/generic/tkFrame.c @@ -792,7 +792,7 @@ FrameWidgetObjCmd( } #endif Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't modify %s option after widget is created", + "cannot modify %s option after widget is created", arg)); Tcl_SetErrorCode(interp, "TK", "FRAME", "CREATE_ONLY", NULL); @@ -1065,7 +1065,7 @@ ConfigureFrame( badLabelWindow: Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't use %s as label in this frame", + "cannot use %s as label in this frame", Tk_PathName(labelframePtr->labelWin))); Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "HIERARCHY", NULL); labelframePtr->labelWin = NULL; diff --git a/generic/tkGrid.c b/generic/tkGrid.c index 50068b5..019dee7 100644 --- a/generic/tkGrid.c +++ b/generic/tkGrid.c @@ -3165,7 +3165,7 @@ ConfigureContent( if (Tk_TopWinHierarchy(content)) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't manage \"%s\": it's a top-level window", + "cannot manage \"%s\": it's a top-level window", Tcl_GetString(objv[j]))); Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "TOPLEVEL", NULL); return TCL_ERROR; @@ -3224,7 +3224,7 @@ ConfigureContent( } if (other == content) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "window can't be managed in itself", TCL_INDEX_NONE)); + "window cannot be managed in itself", TCL_INDEX_NONE)); Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "SELF", NULL); return TCL_ERROR; } @@ -3368,7 +3368,7 @@ ConfigureContent( } if (Tk_TopWinHierarchy(ancestor)) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't put \"%s\" inside \"%s\"", Tcl_GetString(objv[j]), + "cannot put \"%s\" inside \"%s\"", Tcl_GetString(objv[j]), Tk_PathName(containerPtr->tkwin))); Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "HIERARCHY", NULL); Unlink(contentPtr); @@ -3384,7 +3384,7 @@ ConfigureContent( container = (TkWindow *)TkGetContainer(container)) { if (container == (TkWindow *)content) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't put \"%s\" inside \"%s\": would cause management loop", + "cannot put \"%s\" inside \"%s\": would cause management loop", Tcl_GetString(objv[j]), Tk_PathName(containerPtr->tkwin))); Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "LOOP", NULL); Unlink(contentPtr); @@ -3469,7 +3469,7 @@ ConfigureContent( if (containerPtr == NULL) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "can't use '^', can't find container window", TCL_INDEX_NONE)); + "cannot use '^', cannot find container window", TCL_INDEX_NONE)); Tcl_SetErrorCode(interp, "TK", "GRID", "SHORTCUT_USAGE", NULL); return TCL_ERROR; } @@ -3523,7 +3523,7 @@ ConfigureContent( } if (!match) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "can't find content to extend with \"^\"", TCL_INDEX_NONE)); + "cannot find content to extend with \"^\"", TCL_INDEX_NONE)); Tcl_SetErrorCode(interp, "TK", "GRID", "SHORTCUT_USAGE", NULL); return TCL_ERROR; } @@ -3531,7 +3531,7 @@ ConfigureContent( if (containerPtr == NULL) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "can't determine container window", TCL_INDEX_NONE)); + "cannot determine container window", TCL_INDEX_NONE)); Tcl_SetErrorCode(interp, "TK", "GRID", "SHORTCUT_USAGE", NULL); return TCL_ERROR; } diff --git a/generic/tkImage.c b/generic/tkImage.c index 43b5123..5167dee 100644 --- a/generic/tkImage.c +++ b/generic/tkImage.c @@ -258,7 +258,7 @@ Tk_ImageObjCmd( } if (typePtr == NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "image type \"%s\" doesn't exist", arg)); + "image type \"%s\" does not exist", arg)); Tcl_SetErrorCode(interp, "TK", "LOOKUP", "IMAGE_TYPE", arg, (char *)NULL); return TCL_ERROR; } @@ -482,14 +482,14 @@ Tk_ImageObjCmd( Tcl_SetObjResult(interp, Tcl_NewWideIntObj(modelPtr->width)); break; default: - Tcl_Panic("can't happen"); + Tcl_Panic("cannot happen"); } break; } return TCL_OK; alreadyDeleted: - Tcl_SetObjResult(interp, Tcl_ObjPrintf("image \"%s\" doesn't exist",arg)); + Tcl_SetObjResult(interp, Tcl_ObjPrintf("image \"%s\" does not exist",arg)); Tcl_SetErrorCode(interp, "TK", "LOOKUP", "IMAGE", arg, (char *)NULL); return TCL_ERROR; } @@ -635,7 +635,7 @@ Tk_GetImage( noSuchImage: if (interp) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "image \"%s\" doesn't exist", name)); + "image \"%s\" does not exist", name)); Tcl_SetErrorCode(interp, "TK", "LOOKUP", "IMAGE", name, (char *)NULL); } return NULL; diff --git a/generic/tkImgBmap.c b/generic/tkImgBmap.c index 116ef41..b130794 100644 --- a/generic/tkImgBmap.c +++ b/generic/tkImgBmap.c @@ -269,7 +269,7 @@ ImgBmapConfigureModel( || (modelPtr->maskDataString != NULL)) { if (modelPtr->data == NULL) { Tcl_SetObjResult(modelPtr->interp, Tcl_NewStringObj( - "can't have mask without bitmap", TCL_INDEX_NONE)); + "cannot have mask without bitmap", TCL_INDEX_NONE)); Tcl_SetErrorCode(modelPtr->interp, "TK", "IMAGE", "BITMAP", "NO_BITMAP", NULL); return TCL_ERROR; @@ -486,7 +486,7 @@ TkGetBitmapData( if (string == NULL) { if ((interp != NULL) && Tcl_IsSafe(interp)) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "can't get bitmap data from a file in a safe interpreter", + "cannot get bitmap data from a file in a safe interpreter", -1)); Tcl_SetErrorCode(interp, "TK", "SAFE", "BITMAP_FILE", NULL); return NULL; diff --git a/generic/tkImgPhoto.c b/generic/tkImgPhoto.c index 27ffbed..ddd3a9d 100644 --- a/generic/tkImgPhoto.c +++ b/generic/tkImgPhoto.c @@ -613,7 +613,7 @@ ImgPhotoCmd( srcHandle = Tk_FindPhoto(interp, Tcl_GetString(options.name)); if (srcHandle == NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "image \"%s\" doesn't exist or is not a photo image", + "image \"%s\" does not exist or is not a photo image", Tcl_GetString(options.name))); Tcl_SetErrorCode(interp, "TK", "LOOKUP", "PHOTO", Tcl_GetString(options.name), (char *)NULL); @@ -1034,7 +1034,7 @@ ImgPhotoCmd( if (Tcl_IsSafe(interp)) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "can't get image from a file in a safe interpreter", TCL_INDEX_NONE)); + "cannot get image from a file in a safe interpreter", TCL_INDEX_NONE)); Tcl_SetErrorCode(interp, "TK", "SAFE", "PHOTO_FILE", (char *)NULL); return TCL_ERROR; } @@ -1361,7 +1361,7 @@ readCleanup: if (Tcl_IsSafe(interp)) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "can't write image to a file in a safe interpreter", TCL_INDEX_NONE)); + "cannot write image to a file in a safe interpreter", TCL_INDEX_NONE)); Tcl_SetErrorCode(interp, "TK", "SAFE", "PHOTO_FILE", (char *)NULL); return TCL_ERROR; } @@ -2069,7 +2069,7 @@ ImgPhotoConfigureModel( if (Tcl_IsSafe(interp)) { Tcl_ResetResult(interp); Tcl_SetObjResult(interp, Tcl_NewStringObj( - "can't get image from a file in a safe interpreter", + "cannot get image from a file in a safe interpreter", -1)); Tcl_SetErrorCode(interp, "TK", "SAFE", "PHOTO_FILE", (char *)NULL); goto errorExit; diff --git a/generic/tkOption.c b/generic/tkOption.c index f6976bd..710e133 100644 --- a/generic/tkOption.c +++ b/generic/tkOption.c @@ -1095,7 +1095,7 @@ ReadOptionFile( if (Tcl_IsSafe(interp)) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "can't read options from a file in a safe interpreter", TCL_INDEX_NONE)); + "cannot read options from a file in a safe interpreter", TCL_INDEX_NONE)); Tcl_SetErrorCode(interp, "TK", "SAFE", "OPTION_FILE", (char *)NULL); return TCL_ERROR; } diff --git a/generic/tkPack.c b/generic/tkPack.c index 3ad8cae..c530bd8 100644 --- a/generic/tkPack.c +++ b/generic/tkPack.c @@ -1241,7 +1241,7 @@ ConfigureContent( } if (Tk_TopWinHierarchy(content)) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't pack \"%s\": it's a top-level window", + "cannot pack \"%s\": it's a top-level window", Tcl_GetString(objv[j]))); Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "TOPLEVEL", NULL); return TCL_ERROR; @@ -1464,7 +1464,7 @@ ConfigureContent( } if (Tk_TopWinHierarchy(ancestor)) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't pack \"%s\" inside \"%s\"", Tcl_GetString(objv[j]), + "cannot pack \"%s\" inside \"%s\"", Tcl_GetString(objv[j]), Tk_PathName(containerPtr->tkwin))); Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "HIERARCHY", NULL); return TCL_ERROR; @@ -1472,7 +1472,7 @@ ConfigureContent( } if (content == containerPtr->tkwin) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't pack \"%s\" inside itself", Tcl_GetString(objv[j]))); + "cannot pack \"%s\" inside itself", Tcl_GetString(objv[j]))); Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "SELF", NULL); return TCL_ERROR; } @@ -1485,7 +1485,7 @@ ConfigureContent( container = (TkWindow *)TkGetContainer(container)) { if (container == (TkWindow *)content) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't put \"%s\" inside \"%s\": would cause management loop", + "cannot put \"%s\" inside \"%s\": would cause management loop", Tcl_GetString(objv[j]), Tk_PathName(containerPtr->tkwin))); Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "LOOP", NULL); return TCL_ERROR; diff --git a/generic/tkPanedWindow.c b/generic/tkPanedWindow.c index b244c9a..d2bd4e4 100644 --- a/generic/tkPanedWindow.c +++ b/generic/tkPanedWindow.c @@ -798,7 +798,7 @@ ConfigurePanes( */ Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't add %s to itself", arg)); + "cannot add %s to itself", arg)); Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "SELF", (char *)NULL); return TCL_ERROR; } else if (Tk_IsTopLevel(tkwin)) { @@ -807,7 +807,7 @@ ConfigurePanes( */ Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't add toplevel %s to %s", arg, + "cannot add toplevel %s to %s", arg, Tk_PathName(pwPtr->tkwin))); Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "TOPLEVEL", (char *)NULL); return TCL_ERROR; @@ -824,7 +824,7 @@ ConfigurePanes( } if (Tk_IsTopLevel(ancestor)) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't add %s to %s", arg, + "cannot add %s to %s", arg, Tk_PathName(pwPtr->tkwin))); Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "HIERARCHY", (char *)NULL); diff --git a/generic/tkPlace.c b/generic/tkPlace.c index 013c531..6698c79 100644 --- a/generic/tkPlace.c +++ b/generic/tkPlace.c @@ -624,7 +624,7 @@ ConfigureContent( if (Tk_TopWinHierarchy(tkwin)) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't use placer on top-level window \"%s\"; use " + "cannot use placer on top-level window \"%s\"; use " "wm command instead", Tk_PathName(tkwin))); Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "TOPLEVEL", (char *)NULL); return TCL_ERROR; @@ -664,7 +664,7 @@ ConfigureContent( } if (Tk_TopWinHierarchy(ancestor)) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't place \"%s\" relative to \"%s\"", + "cannot place \"%s\" relative to \"%s\"", Tk_PathName(contentPtr->tkwin), Tk_PathName(win))); Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "HIERARCHY", (char *)NULL); goto error; @@ -672,7 +672,7 @@ ConfigureContent( } if (contentPtr->tkwin == win) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't place \"%s\" relative to itself", + "cannot place \"%s\" relative to itself", Tk_PathName(contentPtr->tkwin))); Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "LOOP", (char *)NULL); goto error; @@ -686,7 +686,7 @@ ConfigureContent( container = (TkWindow *)TkGetContainer(container)) { if (container == (TkWindow *)contentPtr->tkwin) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't put \"%s\" inside \"%s\": would cause management loop", + "cannot put \"%s\" inside \"%s\": would cause management loop", Tk_PathName(contentPtr->tkwin), Tk_PathName(win))); Tcl_SetErrorCode(interp, "TK", "GEOMETRY", "LOOP", (char *)NULL); goto error; diff --git a/generic/tkScale.c b/generic/tkScale.c index eeda9cd..8fdf610 100644 --- a/generic/tkScale.c +++ b/generic/tkScale.c @@ -1388,7 +1388,7 @@ ScaleVarProc( TCL_GLOBAL_ONLY); result = Tcl_GetDoubleFromObj(interp, valuePtr, &value); if (result != TCL_OK) { - resultStr = "can't assign non-numeric value to scale variable"; + resultStr = "cannot assign non-numeric value to scale variable"; ScaleSetVariable(scalePtr); } else { scalePtr->value = TkRoundValueToResolution(scalePtr, value); diff --git a/generic/tkSelect.c b/generic/tkSelect.c index 752b5ea..2bb8be6 100644 --- a/generic/tkSelect.c +++ b/generic/tkSelect.c @@ -643,7 +643,7 @@ Tk_GetSelection( cantget: Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "%s selection doesn't exist or form \"%s\" not defined", + "%s selection does not exist or form \"%s\" not defined", Tk_GetAtomName(tkwin, selection), Tk_GetAtomName(tkwin, target))); return TCL_ERROR; diff --git a/generic/tkTextIndex.c b/generic/tkTextIndex.c index 4acad9d..1589397 100644 --- a/generic/tkTextIndex.c +++ b/generic/tkTextIndex.c @@ -841,7 +841,7 @@ GetIndex( tagName = (const char *)Tcl_GetHashKey(&sharedPtr->tagTable, hPtr); } Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "text doesn't contain any characters tagged with \"%s\"", + "text does not contain any characters tagged with \"%s\"", tagName)); Tcl_SetErrorCode(interp, "TK", "LOOKUP", "TEXT_INDEX", tagName, (char *)NULL); diff --git a/generic/tkTextWind.c b/generic/tkTextWind.c index 8c71e48..5c74fab 100644 --- a/generic/tkTextWind.c +++ b/generic/tkTextWind.c @@ -439,7 +439,7 @@ EmbWinConfigure( if (Tk_TopWinHierarchy(ancestor)) { badContainer: Tcl_SetObjResult(textPtr->interp, Tcl_ObjPrintf( - "can't embed %s in %s", + "cannot embed %s in %s", Tk_PathName(ewPtr->body.ew.tkwin), Tk_PathName(textPtr->tkwin))); Tcl_SetErrorCode(textPtr->interp, "TK", "GEOMETRY", @@ -936,7 +936,7 @@ EmbWinLayoutProc( || (textPtr->tkwin == ewPtr->body.ew.tkwin)) { badContainer: Tcl_SetObjResult(textPtr->interp, Tcl_ObjPrintf( - "can't embed %s relative to %s", + "cannot embed %s relative to %s", Tk_PathName(ewPtr->body.ew.tkwin), Tk_PathName(textPtr->tkwin))); Tcl_SetErrorCode(textPtr->interp, "TK", "GEOMETRY", "HIERARCHY", diff --git a/generic/tkVisual.c b/generic/tkVisual.c index 9089e74..7b9518b 100644 --- a/generic/tkVisual.c +++ b/generic/tkVisual.c @@ -406,13 +406,13 @@ Tk_GetColormap( } if (Tk_Screen(other) != Tk_Screen(tkwin)) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't use colormap for %s: not on same screen", string)); + "cannot use colormap for %s: not on same screen", string)); Tcl_SetErrorCode(interp, "TK", "COLORMAP", "SCREEN", (char *)NULL); return None; } if (Tk_Visual(other) != Tk_Visual(tkwin)) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't use colormap for %s: incompatible visuals", string)); + "cannot use colormap for %s: incompatible visuals", string)); Tcl_SetErrorCode(interp, "TK", "COLORMAP", "INCOMPATIBLE", (char *)NULL); return None; } diff --git a/generic/tkWindow.c b/generic/tkWindow.c index 9d36e9f..2f64a91 100644 --- a/generic/tkWindow.c +++ b/generic/tkWindow.c @@ -1115,12 +1115,12 @@ Tk_CreateWindow( if (parentPtr) { if (parentPtr->flags & TK_ALREADY_DEAD) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "can't create window: parent has been destroyed", TCL_INDEX_NONE)); + "cannot create window: parent has been destroyed", TCL_INDEX_NONE)); Tcl_SetErrorCode(interp, "TK", "CREATE", "DEAD_PARENT", (char *)NULL); return NULL; } else if (parentPtr->flags & TK_CONTAINER) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "can't create window: its parent has -container = yes", + "cannot create window: its parent has -container = yes", TCL_INDEX_NONE)); Tcl_SetErrorCode(interp, "TK", "CREATE", "CONTAINER", (char *)NULL); return NULL; @@ -1179,12 +1179,12 @@ Tk_CreateAnonymousWindow( if (parentPtr) { if (parentPtr->flags & TK_ALREADY_DEAD) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "can't create window: parent has been destroyed", TCL_INDEX_NONE)); + "cannot create window: parent has been destroyed", TCL_INDEX_NONE)); Tcl_SetErrorCode(interp, "TK", "CREATE", "DEAD_PARENT", (char *)NULL); return NULL; } else if (parentPtr->flags & TK_CONTAINER) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "can't create window: its parent has -container = yes", + "cannot create window: its parent has -container = yes", TCL_INDEX_NONE)); Tcl_SetErrorCode(interp, "TK", "CREATE", "CONTAINER", (char *)NULL); return NULL; @@ -1294,12 +1294,12 @@ Tk_CreateWindowFromPath( } if (((TkWindow *) parent)->flags & TK_ALREADY_DEAD) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "can't create window: parent has been destroyed", TCL_INDEX_NONE)); + "cannot create window: parent has been destroyed", TCL_INDEX_NONE)); Tcl_SetErrorCode(interp, "TK", "CREATE", "DEAD_PARENT", (char *)NULL); return NULL; } else if (((TkWindow *) parent)->flags & TK_CONTAINER) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "can't create window: its parent has -container = yes", TCL_INDEX_NONE)); + "cannot create window: its parent has -container = yes", TCL_INDEX_NONE)); Tcl_SetErrorCode(interp, "TK", "CREATE", "CONTAINER", (char *)NULL); return NULL; } diff --git a/generic/ttk/ttkManager.c b/generic/ttk/ttkManager.c index 1ea5f54..9ec41cd 100644 --- a/generic/ttk/ttkManager.c +++ b/generic/ttk/ttkManager.c @@ -549,7 +549,7 @@ int Ttk_Maintainable(Tcl_Interp *interp, Tk_Window window, Tk_Window container) return 1; badWindow: - Tcl_SetObjResult(interp, Tcl_ObjPrintf("can't add %s as content of %s", + Tcl_SetObjResult(interp, Tcl_ObjPrintf("cannot add %s as content of %s", Tk_PathName(window), Tk_PathName(container))); Tcl_SetErrorCode(interp, "TTK", "GEOMETRY", "MAINTAINABLE", NULL); return 0; diff --git a/generic/ttk/ttkTheme.c b/generic/ttk/ttkTheme.c index c60dd13..b32c09e 100644 --- a/generic/ttk/ttkTheme.c +++ b/generic/ttk/ttkTheme.c @@ -610,7 +610,7 @@ static Ttk_Theme LookupTheme( entryPtr = Tcl_FindHashEntry(&pkgPtr->themeTable, name); if (!entryPtr) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "theme \"%s\" doesn't exist", name)); + "theme \"%s\" does not exist", name)); Tcl_SetErrorCode(interp, "TTK", "LOOKUP", "THEME", name, NULL); return NULL; } diff --git a/library/button.tcl b/library/button.tcl index 03d70c5..ee6d68c 100644 --- a/library/button.tcl +++ b/library/button.tcl @@ -79,11 +79,21 @@ if {"x11" eq [tk windowingsystem]} { tk::CheckInvoke %W } } + bind Checkbutton <KP_Enter> { + if {!$tk_strictMotif} { + tk::CheckInvoke %W + } + } bind Radiobutton <Return> { if {!$tk_strictMotif} { tk::CheckRadioInvoke %W } } + bind Radiobutton <KP_Enter> { + if {!$tk_strictMotif} { + tk::CheckRadioInvoke %W + } + } bind Checkbutton <Button-1> { tk::CheckInvoke %W } diff --git a/library/clrpick.tcl b/library/clrpick.tcl index 3ab4b13..490761e 100644 --- a/library/clrpick.tcl +++ b/library/clrpick.tcl @@ -272,6 +272,7 @@ proc ::tk::dialog::color::BuildDialog {w} { [list tk::dialog::color::LeaveColorBar $w $color] bind $box.entry <Return> [list tk::dialog::color::HandleRGBEntry $w] + bind $box.entry <KP_Enter> [list tk::dialog::color::HandleRGBEntry $w] } pack $stripsFrame -side left -fill both -padx 3p -pady 7.5p diff --git a/library/demos/ixset b/library/demos/ixset index c934668..a1ab6b0 100644 --- a/library/demos/ixset +++ b/library/demos/ixset @@ -196,6 +196,7 @@ proc createwindows {} { -side left -expand yes -pady 3p bind . <Return> {.buttons.ok flash; .buttons.ok invoke} + bind . <KP_Enter> {.buttons.ok flash; .buttons.ok invoke} bind . <Escape> {.buttons.quit flash; .buttons.quit invoke} bind . <Button-1> { if {![string match .buttons* %W]} { diff --git a/library/demos/knightstour.tcl b/library/demos/knightstour.tcl index 76b6a4f..80fab55 100644 --- a/library/demos/knightstour.tcl +++ b/library/demos/knightstour.tcl @@ -256,6 +256,7 @@ proc CreateGUI {} { bind $dlg <Control-F2> {console show} bind $dlg <Return> [list $dlg.tf.b1 invoke] + bind $dlg <KP_Enter> [list $dlg.tf.b1 invoke] bind $dlg <Escape> [list $dlg.tf.b2 invoke] bind $dlg <Destroy> [namespace code [list Stop]] wm protocol $dlg WM_DELETE_WINDOW [namespace code [list Exit $dlg]] diff --git a/library/demos/label.tcl b/library/demos/label.tcl index 0644de8..aed22fb 100644 --- a/library/demos/label.tcl +++ b/library/demos/label.tcl @@ -16,7 +16,7 @@ wm title $w "Label Demonstration" wm iconname $w "label" positionWindow $w -label $w.msg -font $font -wraplength 4i -justify left -text "Five labels are displayed below: three textual ones on the left, and an image label and a text label on the right. Labels are pretty boring because you can't do anything with them." +label $w.msg -font $font -wraplength 4i -justify left -text "Five labels are displayed below: three textual ones on the left, and an image label and a text label on the right. Labels are pretty boring because you cannot do anything with them." pack $w.msg -side top ## See Code / Dismiss buttons diff --git a/library/demos/rmt b/library/demos/rmt index 21c6ca0..1c1d102 100644 --- a/library/demos/rmt +++ b/library/demos/rmt @@ -60,6 +60,12 @@ bind .t <Return> { invoke break } +bind .t <KP_Enter> { + .t mark set insert {end - 1c} + .t insert insert \n + invoke + break +} bind .t <Delete> { catch {.t tag remove sel sel.first promptEnd} if {[.t tag nextrange sel 1.0 end] eq ""} { diff --git a/library/demos/tcolor b/library/demos/tcolor index b349c5b..1f8a57e 100644 --- a/library/demos/tcolor +++ b/library/demos/tcolor @@ -122,6 +122,7 @@ labelframe .name -text "Name:" -padx 1m -pady 1m entry .name.e -textvariable name -width 10 pack .name.e -side right -expand 1 -fill x bind .name.e <Return> {tc_loadNamedColor $name} +bind .name.e <KP_Enter> {tc_loadNamedColor $name} grid .name -column 1 -row 1 -sticky nsew -padx .15c -pady .15c # Create the color display swatch on the right side of the window. diff --git a/library/dialog.tcl b/library/dialog.tcl index 16ba128..e9ba0c3 100644 --- a/library/dialog.tcl +++ b/library/dialog.tcl @@ -129,6 +129,7 @@ proc ::tk_dialog {w title text bitmap default args} { if {$default >= 0} { bind $w <Return> [list $w.button$default invoke] + bind $w <KP_Enter> [list $w.button$default invoke] } bind $w <<PrevWindow>> [list bind $w <Return> {[tk_focusPrev %W] invoke}] bind $w <<NextWindow>> [list bind $w <Return> {[tk_focusNext %W] invoke}] diff --git a/library/fontchooser.tcl b/library/fontchooser.tcl index 3aaa6b7..84e2af8 100644 --- a/library/fontchooser.tcl +++ b/library/fontchooser.tcl @@ -238,6 +238,7 @@ proc ::tk::fontchooser::Create {} { wm minsize $S(W) $min [::tk::ScaleNum 260] bind $S(W) <Return> [namespace code [list Done 1]] + bind $S(W) <KP_Enter> [namespace code [list Done 1]] bind $S(W) <Escape> [namespace code [list Done 0]] bind $S(W) <Map> [namespace code [list Visibility %W 1]] bind $S(W) <Unmap> [namespace code [list Visibility %W 0]] diff --git a/library/iconbadges.tcl b/library/iconbadges.tcl index fd249a0..0fc3e6b 100644 --- a/library/iconbadges.tcl +++ b/library/iconbadges.tcl @@ -216,13 +216,13 @@ if {[tk windowingsystem] eq "x11"} { } if {[lsearch -exact [image names] $::tk::icons::base_icon($win)] <= 0} { - return -code error "can't use \"$::tk::icons::base_icon($win)\" as iconphoto: not a photo image" + return -code error "cannot use \"$::tk::icons::base_icon($win)\" as iconphoto: not a photo image" } if {!([string is integer $badgenumber] && $badgenumber > 0) && [string match $badgenumber "!"] == 0 && $badgenumber ne ""} { - return -code error "can't use \"$badgenumber\" as icon badge" + return -code error "cannot use \"$badgenumber\" as icon badge" } wm iconphoto $win $::tk::icons::base_icon($win) diff --git a/library/iconlist.tcl b/library/iconlist.tcl index efcd63b..f456e30 100644 --- a/library/iconlist.tcl +++ b/library/iconlist.tcl @@ -451,6 +451,7 @@ package require tk bind $canvas <<PrevChar>> [namespace code {my LeftRight -1}] bind $canvas <<NextChar>> [namespace code {my LeftRight 1}] bind $canvas <Return> [namespace code {my ReturnKey}] + bind $canvas <KP_Enter> [namespace code {my ReturnKey}] bind $canvas <Key> [namespace code {my KeyPress %A}] bind $canvas <Alt-Key> {# nothing} bind $canvas <Meta-Key> {# nothing} diff --git a/library/menu.tcl b/library/menu.tcl index 57dc963..fef986a 100644 --- a/library/menu.tcl +++ b/library/menu.tcl @@ -153,6 +153,9 @@ bind Menu <<Invoke>> { bind Menu <Return> { tk::MenuInvoke %W 0 } +bind Menu <KP_Enter> { + tk::MenuInvoke %W 0 +} bind Menu <Escape> { tk::MenuEscape %W } @@ -262,7 +265,7 @@ proc ::tk::MbPost {w {x {}} {y {}}} { || [$menu cget -type] eq "tearoff"}] if {[string first $w $menu] != 0} { return -code error -errorcode {TK MENUBUTTON POST_NONCHILD} \ - "can't post $menu: it isn't a descendant of $w" + "cannot post $menu: it isn't a descendant of $w" } set cur $Priv(postedMb) if {$cur ne ""} { diff --git a/library/msgbox.tcl b/library/msgbox.tcl index 3757019..fcdcb33 100644 --- a/library/msgbox.tcl +++ b/library/msgbox.tcl @@ -415,6 +415,11 @@ proc ::tk::MessageBox {args} { %W invoke } } + bind $w <KP_Enter> { + if {[winfo class %W] in "Button TButton"} { + %W invoke + } + } # Invoke the designated cancelling operation bind $w <Escape> [list $w.$cancel invoke] diff --git a/library/text.tcl b/library/text.tcl index 15bdef2..8967ff1 100644 --- a/library/text.tcl +++ b/library/text.tcl @@ -217,6 +217,12 @@ bind Text <Return> { %W edit separator } } +bind Text <KP_Enter> { + tk::TextInsert %W \n + if {[%W cget -autoseparators]} { + %W edit separator + } +} bind Text <Delete> { if {[tk::TextCursorInSelection %W]} { %W delete sel.first sel.last @@ -307,7 +313,6 @@ bind Text <Alt-Key> {# nothing } bind Text <Meta-Key> {# nothing} bind Text <Control-Key> {# nothing} bind Text <Escape> {# nothing} -bind Text <KP_Enter> {# nothing} bind Text <Command-Key> {# nothing} bind Text <Fn-Key> {# nothing} diff --git a/library/tkfbox.tcl b/library/tkfbox.tcl index 39d0f3e..8c00b6f 100644 --- a/library/tkfbox.tcl +++ b/library/tkfbox.tcl @@ -482,6 +482,7 @@ proc ::tk::dialog::file::Create {w class} { # if {$class eq "TkFDialog"} { bind $data(ent) <Return> [list ::tk::dialog::file::ActivateEnt $w] + bind $data(ent) <KP_Enter> [list ::tk::dialog::file::ActivateEnt $w] $data(okBtn) configure -command [list ::tk::dialog::file::OkCmd $w] bind $w <Alt-t> [format { if {[%s cget -state] eq "normal"} { @@ -491,7 +492,8 @@ proc ::tk::dialog::file::Create {w class} { } else { set okCmd [list ::tk::dialog::file::chooseDir::OkCmd $w] bind $data(ent) <Return> $okCmd - $data(okBtn) configure -command $okCmd + bind $data(ent) <KP_Enter> $okCmd + $data(okBtn) configure -command $okCmd bind $w <Alt-s> [list focus $data(ent)] bind $w <Alt-o> [list $data(okBtn) invoke] } diff --git a/library/ttk/combobox.tcl b/library/ttk/combobox.tcl index 1b9d4cb..448838b 100644 --- a/library/ttk/combobox.tcl +++ b/library/ttk/combobox.tcl @@ -69,6 +69,7 @@ bind TCombobox <<TraverseIn>> { ttk::combobox::TraverseIn %W } # bind ComboboxListbox <ButtonRelease-1> { ttk::combobox::LBSelected %W } bind ComboboxListbox <Return> { ttk::combobox::LBSelected %W } +bind ComboboxListbox <KP_Enter> { ttk::combobox::LBSelected %W } bind ComboboxListbox <Escape> { ttk::combobox::LBCancel %W } bind ComboboxListbox <Tab> { ttk::combobox::LBTab %W next } bind ComboboxListbox <<PrevWindow>> { ttk::combobox::LBTab %W prev } diff --git a/library/xmfbox.tcl b/library/xmfbox.tcl index e4d0db5..e753a5e 100644 --- a/library/xmfbox.tcl +++ b/library/xmfbox.tcl @@ -399,8 +399,10 @@ proc ::tk::MotifFDialog_BuildUI {w} { bind $w <Alt-Key> [list ::tk::AltKeyInDialog $w %A] bind $data(fEnt) <Return> [list tk::MotifFDialog_ActivateFEnt $w] + bind $data(fEnt) <KP_Enter> [list tk::MotifFDialog_ActivateFEnt $w] bind $data(sEnt) <Return> [list tk::MotifFDialog_ActivateSEnt $w] - bind $w <Escape> [list tk::MotifFDialog_CancelCmd $w] + bind $data(sEnt) <KP_Enter> [list tk::MotifFDialog_ActivateSEnt $w] + bind $w <Escape> [list tk::MotifFDialog_CancelCmd $w] bind $w.bot <Destroy> {set ::tk::Priv(selectFilePath) {}} wm protocol $w WM_DELETE_WINDOW [list tk::MotifFDialog_CancelCmd $w] diff --git a/macosx/tkMacOSXClipboard.c b/macosx/tkMacOSXClipboard.c index 8d5f727..01cef2c 100644 --- a/macosx/tkMacOSXClipboard.c +++ b/macosx/tkMacOSXClipboard.c @@ -141,7 +141,7 @@ TkSelGetSelection( } } else { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "%s selection doesn't exist or form \"%s\" not defined", + "%s selection does not exist or form \"%s\" not defined", Tk_GetAtomName(tkwin, selection), Tk_GetAtomName(tkwin, target))); Tcl_SetErrorCode(interp, "TK", "SELECTION", "EXISTS", NULL); diff --git a/macosx/tkMacOSXEmbed.c b/macosx/tkMacOSXEmbed.c index f95d5d1..2155537 100644 --- a/macosx/tkMacOSXEmbed.c +++ b/macosx/tkMacOSXEmbed.c @@ -213,7 +213,7 @@ Tk_UseWindow( if (winPtr->window != None) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "can't modify container after widget is created", TCL_INDEX_NONE)); + "cannot modify container after widget is created", TCL_INDEX_NONE)); Tcl_SetErrorCode(interp, "TK", "EMBED", "POST_CREATE", NULL); return TCL_ERROR; } @@ -241,7 +241,7 @@ Tk_UseWindow( return TCL_ERROR; } else if (!(usePtr->flags & TK_CONTAINER)) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "window \"%s\" doesn't have -container option set", + "window \"%s\" does not have -container option set", usePtr->pathName)); Tcl_SetErrorCode(interp, "TK", "EMBED", "CONTAINER", NULL); return TCL_ERROR; diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c index fbea56b..2b3b780 100644 --- a/macosx/tkMacOSXWm.c +++ b/macosx/tkMacOSXWm.c @@ -1620,7 +1620,7 @@ WmAspectCmd( if ((numer1 <= 0) || (denom1 <= 0) || (numer2 <= 0) || (denom2 <= 0)) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "aspect number can't be <= 0", TCL_INDEX_NONE)); + "aspect number cannot be <= 0", TCL_INDEX_NONE)); Tcl_SetErrorCode(interp, "TK", "WM", "ASPECT", NULL); return TCL_ERROR; } @@ -2433,13 +2433,13 @@ WmDeiconifyCmd( } if (wmPtr->iconFor != NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't deiconify %s: it is an icon for %s", + "cannot deiconify %s: it is an icon for %s", Tcl_GetString(objv[2]), Tk_PathName(wmPtr->iconFor))); Tcl_SetErrorCode(interp, "TK", "WM", "DEICONIFY", "ICON", NULL); return TCL_ERROR; } else if (winPtr->flags & TK_EMBEDDED) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't deiconify %s: it is an embedded window", + "cannot deiconify %s: it is an embedded window", winPtr->pathName)); Tcl_SetErrorCode(interp, "TK", "WM", "DEICONIFY", "EMBEDDED", NULL); return TCL_ERROR; @@ -2787,16 +2787,16 @@ WmGridCmd( return TCL_ERROR; } if (reqWidth < 0) { - errorMsg = "baseWidth can't be < 0"; + errorMsg = "baseWidth cannot be < 0"; goto error; } else if (reqHeight < 0) { - errorMsg = "baseHeight can't be < 0"; + errorMsg = "baseHeight cannot be < 0"; goto error; } else if (widthInc <= 0) { - errorMsg = "widthInc can't be <= 0"; + errorMsg = "widthInc cannot be <= 0"; goto error; } else if (heightInc <= 0) { - errorMsg = "heightInc can't be <= 0"; + errorMsg = "heightInc cannot be <= 0"; goto error; } Tk_SetGrid((Tk_Window)winPtr, reqWidth, reqHeight, widthInc, @@ -2920,7 +2920,7 @@ WmIconbadgeCmd( if ([label containsString:@"."]) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't use \"%s\" as icon badge", Tcl_GetString(objv[3]))); + "cannot use \"%s\" as icon badge", Tcl_GetString(objv[3]))); return TCL_ERROR; } @@ -2938,7 +2938,7 @@ WmIconbadgeCmd( [dockicon setBadgeLabel:str]; } else { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't use \"%s\" as icon badge", Tcl_GetString(objv[3]))); + "cannot use \"%s\" as icon badge", Tcl_GetString(objv[3]))); return TCL_ERROR; } return TCL_OK; @@ -3046,25 +3046,25 @@ WmIconifyCmd( if (Tk_Attributes((Tk_Window)winPtr)->override_redirect) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't iconify \"%s\": override-redirect flag is set", + "cannot iconify \"%s\": override-redirect flag is set", winPtr->pathName)); Tcl_SetErrorCode(interp, "TK", "WM", "ICONIFY", "OVERRIDE_REDIRECT", NULL); return TCL_ERROR; } else if (wmPtr->container != NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't iconify \"%s\": it is a transient", winPtr->pathName)); + "cannot iconify \"%s\": it is a transient", winPtr->pathName)); Tcl_SetErrorCode(interp, "TK", "WM", "ICONIFY", "TRANSIENT", NULL); return TCL_ERROR; } else if (wmPtr->iconFor != NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't iconify \"%s\": it is an icon for \"%s\"", + "cannot iconify \"%s\": it is an icon for \"%s\"", winPtr->pathName, Tk_PathName(wmPtr->iconFor))); Tcl_SetErrorCode(interp, "TK", "WM", "ICONIFY", "ICON", NULL); return TCL_ERROR; } else if (winPtr->flags & TK_EMBEDDED) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't iconify \"%s\": it is an embedded window", + "cannot iconify \"%s\": it is an embedded window", winPtr->pathName)); Tcl_SetErrorCode(interp, "TK", "WM", "ICONIFY", "EMBEDDED", NULL); return TCL_ERROR; @@ -3273,7 +3273,7 @@ WmIconphotoCmd( tk_icon = Tk_GetImage(interp, tkwin, icon, NULL, NULL); if (tk_icon == NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't use \"%s\" as iconphoto: not a photo image", + "cannot use \"%s\" as iconphoto: not a photo image", icon)); Tcl_SetErrorCode(interp, "TK", "WM", "ICONPHOTO", "PHOTO", NULL); return TCL_ERROR; @@ -3408,7 +3408,7 @@ WmIconwindowCmd( } if (!Tk_IsTopLevel(tkwin2)) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't use %s as icon window: not at top level", + "cannot use %s as icon window: not at top level", Tk_PathName(tkwin2))); Tcl_SetErrorCode(interp, "TK", "WM", "ICONWINDOW", "TOPLEVEL", NULL); @@ -4183,14 +4183,14 @@ WmStateCmd( if (objc == 4) { if (wmPtr->iconFor != NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't change state of \"%s\": it is an icon for \"%s\"", + "cannot change state of \"%s\": it is an icon for \"%s\"", Tcl_GetString(objv[2]), Tk_PathName(wmPtr->iconFor))); Tcl_SetErrorCode(interp, "TK", "WM", "STATE", "ICON", NULL); return TCL_ERROR; } if (winPtr->flags & TK_EMBEDDED) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't change state of \"%s\": it is an embedded window", + "cannot change state of \"%s\": it is an embedded window", winPtr->pathName)); Tcl_SetErrorCode(interp, "TK", "WM", "STATE", "EMBEDDED", NULL); return TCL_ERROR; @@ -4214,7 +4214,7 @@ WmStateCmd( case OPT_ICONIC: if (Tk_Attributes((Tk_Window)winPtr)->override_redirect) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't iconify \"%s\": override-redirect flag is set", + "cannot iconify \"%s\": override-redirect flag is set", winPtr->pathName)); Tcl_SetErrorCode(interp, "TK", "WM", "STATE", "OVERRIDE_REDIRECT", NULL); @@ -4222,7 +4222,7 @@ WmStateCmd( } if (wmPtr->container != NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't iconify \"%s\": it is a transient", + "cannot iconify \"%s\": it is a transient", winPtr->pathName)); Tcl_SetErrorCode(interp, "TK", "WM", "STATE", "TRANSIENT", NULL); @@ -4372,7 +4372,7 @@ WmTransientCmd( if (wmPtr->iconFor != NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't make \"%s\" a transient: it is an icon for %s", + "cannot make \"%s\" a transient: it is an icon for %s", Tcl_GetString(objv[2]), Tk_PathName(wmPtr->iconFor))); Tcl_SetErrorCode(interp, "TK", "WM", "TRANSIENT", "ICON", NULL); return TCL_ERROR; @@ -4386,7 +4386,7 @@ WmTransientCmd( if (wmPtr2 != NULL && wmPtr2->iconFor != NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't make \"%s\" a container: it is an icon for %s", + "cannot make \"%s\" a container: it is an icon for %s", Tcl_GetString(objv[3]), Tk_PathName(wmPtr2->iconFor))); Tcl_SetErrorCode(interp, "TK", "WM", "TRANSIENT", "ICON", NULL); return TCL_ERROR; @@ -4396,7 +4396,7 @@ WmTransientCmd( w = (TkWindow *)w->wmInfoPtr->container) { if (w == winPtr) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't set \"%s\" as container: would cause management loop", + "cannot set \"%s\" as container: would cause management loop", Tk_PathName(containerPtr))); Tcl_SetErrorCode(interp, "TK", "WM", "TRANSIENT", "SELF", NULL); return TCL_ERROR; @@ -4526,7 +4526,7 @@ WmWithdrawCmd( if (wmPtr->iconFor != NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't withdraw %s: it is an icon for %s", + "cannot withdraw %s: it is an icon for %s", Tcl_GetString(objv[2]), Tk_PathName(wmPtr->iconFor))); Tcl_SetErrorCode(interp, "TK", "WM", "WITHDRAW", "ICON", NULL); return TCL_ERROR; diff --git a/tests/bind.test b/tests/bind.test index 5421e62..bd6f6c4 100644 --- a/tests/bind.test +++ b/tests/bind.test @@ -2974,7 +2974,7 @@ test bind-22.23 {HandleEventGenerate: options <Key> -above .} -setup { return $x } -cleanup { destroy .t.f -} -returnCodes error -result {<Key> event doesn't accept "-above" option} +} -returnCodes error -result {<Key> event does not accept "-above" option} test bind-22.24 {HandleEventGenerate: options <Configure> -borderwidth xyz} -setup { frame .t.f -class Test -width 150 -height 100 @@ -3015,7 +3015,7 @@ test bind-22.26 {HandleEventGenerate: options <Key> -borderwidth 2i} -setup { event generate .t.f <Key> -borderwidth 2i } -cleanup { destroy .t.f -} -returnCodes error -result {<Key> event doesn't accept "-borderwidth" option} +} -returnCodes error -result {<Key> event does not accept "-borderwidth" option} test bind-22.27 {HandleEventGenerate: options <Button> -button xyz} -setup { frame .t.f -class Test -width 150 -height 100 @@ -3069,7 +3069,7 @@ test bind-22.30 {HandleEventGenerate: options <Key> -button 1} -setup { event generate .t.f <Key> -button 1 } -cleanup { destroy .t.f -} -returnCodes error -result {<Key> event doesn't accept "-button" option} +} -returnCodes error -result {<Key> event does not accept "-button" option} test bind-22.31 {HandleEventGenerate: options <Expose> -count xyz} -setup { frame .t.f -class Test -width 150 -height 100 @@ -3109,7 +3109,7 @@ test bind-22.33 {HandleEventGenerate: options <Key> -count 20} -setup { event generate .t.f <Key> -count 20 } -cleanup { destroy .t.f -} -returnCodes error -result {<Key> event doesn't accept "-count" option} +} -returnCodes error -result {<Key> event does not accept "-count" option} test bind-22.34 {HandleEventGenerate: options <Enter> -detail xyz} -setup { frame .t.f -class Test -width 150 -height 100 @@ -3177,7 +3177,7 @@ test bind-22.37 {HandleEventGenerate: options <Key> -detail NotifyVirtual} -setu event generate .t.f <Key> -detail NotifyVirtual } -cleanup { destroy .t.f -} -returnCodes error -result {<Key> event doesn't accept "-detail" option} +} -returnCodes error -result {<Key> event does not accept "-detail" option} test bind-22.38 {HandleEventGenerate: options <Enter> -focus xyz} -setup { frame .t.f -class Test -width 150 -height 100 @@ -3217,7 +3217,7 @@ test bind-22.40 {HandleEventGenerate: options <Key> -focus 1} -setup { event generate .t.f <Key> -focus 1 } -cleanup { destroy .t.f -} -returnCodes error -result {<Key> event doesn't accept "-focus" option} +} -returnCodes error -result {<Key> event does not accept "-focus" option} test bind-22.41 {HandleEventGenerate: options <Expose> -height xyz} -setup { frame .t.f -class Test -width 150 -height 100 @@ -3271,7 +3271,7 @@ test bind-22.44 {HandleEventGenerate: options <Key> -height 2i} -setup { event generate .t.f <Key> -height 2i } -cleanup { destroy .t.f -} -returnCodes error -result {<Key> event doesn't accept "-height" option} +} -returnCodes error -result {<Key> event does not accept "-height" option} test bind-22.45 {HandleEventGenerate: options <Key> -keycode xyz} -setup { frame .t.f -class Test -width 150 -height 100 @@ -3311,7 +3311,7 @@ test bind-22.47 {HandleEventGenerate: options <Button> -keycode 20} -setup { event generate .t.f <Button> -keycode 20 } -cleanup { destroy .t.f -} -returnCodes error -result {<Button> event doesn't accept "-keycode" option} +} -returnCodes error -result {<Button> event does not accept "-keycode" option} test bind-22.48 {HandleEventGenerate: options <Key> -keysym xyz} -setup { frame .t.f -class Test -width 150 -height 100 @@ -3351,7 +3351,7 @@ test bind-22.50 {HandleEventGenerate: options <Button> -keysym space} -setup { event generate .t.f <Button> -keysym space } -cleanup { destroy .t.f -} -returnCodes error -result {<Button> event doesn't accept "-keysym" option} +} -returnCodes error -result {<Button> event does not accept "-keysym" option} test bind-22.51 {HandleEventGenerate: options <Enter> -mode xyz} -setup { frame .t.f -class Test -width 150 -height 100 @@ -3405,7 +3405,7 @@ test bind-22.54 {HandleEventGenerate: options <Key> -mode NotifyNormal} -setup { event generate .t.f <Key> -mode NotifyNormal } -cleanup { destroy .t.f -} -returnCodes error -result {<Key> event doesn't accept "-mode" option} +} -returnCodes error -result {<Key> event does not accept "-mode" option} test bind-22.55 {HandleEventGenerate: options <Map> -override xyz} -setup { frame .t.f -class Test -width 150 -height 100 pack .t.f @@ -3472,7 +3472,7 @@ test bind-22.59 {HandleEventGenerate: options <Key> -override 1} -setup { event generate .t.f <Key> -override 1 } -cleanup { destroy .t.f -} -returnCodes error -result {<Key> event doesn't accept "-override" option} +} -returnCodes error -result {<Key> event does not accept "-override" option} test bind-22.60 {HandleEventGenerate: options <Circulate> -place xyz} -setup { frame .t.f -class Test -width 150 -height 100 @@ -3512,7 +3512,7 @@ test bind-22.62 {HandleEventGenerate: options <Key> -place PlaceOnTop} -setup { event generate .t.f <Key> -place PlaceOnTop } -cleanup { destroy .t.f -} -returnCodes error -result {<Key> event doesn't accept "-place" option} +} -returnCodes error -result {<Key> event does not accept "-place" option} test bind-22.63 {HandleEventGenerate: options <Key> -root .xyz} -setup { frame .t.f -class Test -width 150 -height 100 @@ -3649,7 +3649,7 @@ test bind-22.72 {HandleEventGenerate: options <Configure> -root .t} -setup { event generate .t.f <Configure> -root .t } -cleanup { destroy .t.f -} -returnCodes error -result {<Configure> event doesn't accept "-root" option} +} -returnCodes error -result {<Configure> event does not accept "-root" option} test bind-22.73 {HandleEventGenerate: options <Key> -rootx xyz} -setup { frame .t.f -class Test -width 150 -height 100 @@ -3759,7 +3759,7 @@ test bind-22.80 {HandleEventGenerate: options <Configure> -rootx 2i} -setup { event generate .t.f <Configure> -rootx 2i } -cleanup { destroy .t.f -} -returnCodes error -result {<Configure> event doesn't accept "-rootx" option} +} -returnCodes error -result {<Configure> event does not accept "-rootx" option} test bind-22.81 {HandleEventGenerate: options <Key> -rooty xyz} -setup { frame .t.f -class Test -width 150 -height 100 @@ -3869,7 +3869,7 @@ test bind-22.88 {HandleEventGenerate: options <Configure> -rooty 2i} -setup { event generate .t.f <Configure> -rooty 2i } -cleanup { destroy .t.f -} -returnCodes error -result {<Configure> event doesn't accept "-rooty" option} +} -returnCodes error -result {<Configure> event does not accept "-rooty" option} test bind-22.89 {HandleEventGenerate: options <Key> -sendevent xyz} -setup { frame .t.f -class Test -width 150 -height 100 @@ -4088,7 +4088,7 @@ test bind-22.104 {HandleEventGenerate: options <Configure> -state xyz} -setup { event generate .t.f <Configure> -state xyz } -cleanup { destroy .t.f -} -returnCodes error -result {<Configure> event doesn't accept "-state" option} +} -returnCodes error -result {<Configure> event does not accept "-state" option} test bind-22.105 {HandleEventGenerate: options <Key> -subwindow .xyz} -setup { frame .t.f -class Test -width 150 -height 100 @@ -4225,7 +4225,7 @@ test bind-22.114 {HandleEventGenerate: options <Configure> -subwindow .t} -setup event generate .t.f <Configure> -subwindow .t } -cleanup { destroy .t.f -} -returnCodes error -result {<Configure> event doesn't accept "-subwindow" option} +} -returnCodes error -result {<Configure> event does not accept "-subwindow" option} test bind-22.115 {HandleEventGenerate: options <Key> -time xyz} -setup { frame .t.f -class Test -width 150 -height 100 @@ -4349,7 +4349,7 @@ test bind-22.123 {HandleEventGenerate: options <Configure> -time 100} -setup { event generate .t.f <Configure> -time 100 } -cleanup { destroy .t.f -} -returnCodes error -result {<Configure> event doesn't accept "-time" option} +} -returnCodes error -result {<Configure> event does not accept "-time" option} test bind-22.124 {HandleEventGenerate: options <Expose> -width xyz} -setup { frame .t.f -class Test -width 150 -height 100 @@ -4403,7 +4403,7 @@ test bind-22.127 {HandleEventGenerate: options <Key> -width 2i} -setup { event generate .t.f <Key> -width 2i } -cleanup { destroy .t.f -} -returnCodes error -result {<Key> event doesn't accept "-width" option} +} -returnCodes error -result {<Key> event does not accept "-width" option} test bind-22.128 {HandleEventGenerate: options <Unmap> -window .xyz} -setup { frame .t.f -class Test -width 150 -height 100 @@ -4554,7 +4554,7 @@ test bind-22.138 {HandleEventGenerate: options <Key> -window .t.f} -setup { event generate .t.f <Key> -window .t.f } -cleanup { destroy .t.f -} -returnCodes error -result {<Key> event doesn't accept "-window" option} +} -returnCodes error -result {<Key> event does not accept "-window" option} test bind-22.139 {HandleEventGenerate: options <Key> -x xyz} -setup { frame .t.f -class Test -width 150 -height 100 @@ -4720,7 +4720,7 @@ test bind-22.150 {HandleEventGenerate: options <Map> -x 2i} -setup { event generate .t.f <Map> -x 2i } -cleanup { destroy .t.f -} -returnCodes error -result {<Map> event doesn't accept "-x" option} +} -returnCodes error -result {<Map> event does not accept "-x" option} test bind-22.151 {HandleEventGenerate: options <Key> -y xyz} -setup { frame .t.f -class Test -width 150 -height 100 @@ -4886,7 +4886,7 @@ test bind-22.162 {HandleEventGenerate: options <Map> -y 2i} -setup { event generate .t.f <Map> -y 2i } -cleanup { destroy .t.f -} -returnCodes error -result {<Map> event doesn't accept "-y" option} +} -returnCodes error -result {<Map> event does not accept "-y" option} test bind-22.163 {HandleEventGenerate: options <Key> -xyz 1} -setup { frame .t.f -class Test -width 150 -height 100 @@ -6172,7 +6172,7 @@ test bind-31.1 {virtual event user_data field - bad generation} -setup { event generate .t.f <FocusIn> -data foo } -cleanup { destroy .t.f -} -returnCodes error -result {<FocusIn> event doesn't accept "-data" option} +} -returnCodes error -result {<FocusIn> event does not accept "-data" option} test bind-31.2 {virtual event user_data field - NULL, synch} -setup { frame .t.f -class Test -width 150 -height 100 pack .t.f diff --git a/tests/busy.test b/tests/busy.test index e4f5165..b6c88b3 100644 --- a/tests/busy.test +++ b/tests/busy.test @@ -138,7 +138,7 @@ test busy-3.4 {tk busy cget non-busy window} -setup { tk busy cget .f -cursor } -cleanup { destroy .f -} -returnCodes error -result {can't find busy window ".f"} +} -returnCodes error -result {cannot find busy window ".f"} test busy-3.5 {tk busy cget invalid option} -setup { pack [frame .f] tk busy hold .f @@ -194,7 +194,7 @@ test busy-4.3 {tk busy configure non-busy window} -setup { tk busy configure .f } -cleanup { destroy .f -} -returnCodes error -result {can't find busy window ".f"} +} -returnCodes error -result {cannot find busy window ".f"} test busy-4.4 {tk busy configure} -constraints {nonwin} -setup { pack [frame .f] @@ -332,7 +332,7 @@ test busy-5.3 {tk busy forget non busy window} -setup { tk busy forget .f } -cleanup { destroy .f -} -returnCodes error -result {can't find busy window ".f"} +} -returnCodes error -result {cannot find busy window ".f"} test busy-5.4 {tk busy forget window} -setup { pack [frame .f] tk busy hold .f diff --git a/tests/button.test b/tests/button.test index 3479fc0..ee36c08 100644 --- a/tests/button.test +++ b/tests/button.test @@ -1020,7 +1020,7 @@ test button-1.104 {configuration option: "activebackground" for label} -setup { .l configure -font {} } -cleanup { destroy .l -} -returnCodes {error} -result {font "" doesn't exist} +} -returnCodes {error} -result {font "" does not exist} test button-1.105 {configuration option: "font" for button} -setup { button .b -borderwidth 2 -highlightthickness 2 pack .b @@ -1039,7 +1039,7 @@ test button-1.106 {configuration option: "activebackground" for button} -setup { .b configure -font {} } -cleanup { destroy .b -} -returnCodes {error} -result {font "" doesn't exist} +} -returnCodes {error} -result {font "" does not exist} test button-1.107 {configuration option: "font" for checkbutton} -setup { checkbutton .c -borderwidth 2 -highlightthickness 2 pack .c @@ -1058,7 +1058,7 @@ test button-1.108 {configuration option: "activebackground" for checkbutton} -se .c configure -font {} } -cleanup { destroy .c -} -returnCodes {error} -result {font "" doesn't exist} +} -returnCodes {error} -result {font "" does not exist} test button-1.109 {configuration option: "font" for radiobutton} -setup { radiobutton .r -borderwidth 2 -highlightthickness 2 pack .r @@ -1077,7 +1077,7 @@ test button-1.110 {configuration option: "activebackground" for radiobutton} -se .r configure -font {} } -cleanup { destroy .r -} -returnCodes {error} -result {font "" doesn't exist} +} -returnCodes {error} -result {font "" does not exist} test button-1.111 {configuration option: "foreground" for label} -setup { label .l -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold} @@ -1486,7 +1486,7 @@ test button-1.152 {configuration option: "image" for label} -setup { .l configure -image bogus } -cleanup { destroy .l -} -returnCodes {error} -result {image "bogus" doesn't exist} +} -returnCodes {error} -result {image "bogus" does not exist} test button-1.153 {configuration option: "image" for button} -constraints { testImageType } -setup { @@ -1509,7 +1509,7 @@ test button-1.154 {configuration option: "image" for button} -setup { .b configure -image bogus } -cleanup { destroy .b -} -returnCodes {error} -result {image "bogus" doesn't exist} +} -returnCodes {error} -result {image "bogus" does not exist} test button-1.155 {configuration option: "image" for checkbutton} -constraints { testImageType } -setup { @@ -1532,7 +1532,7 @@ test button-1.156 {configuration option: "image" for checkbutton} -setup { .c configure -image bogus } -cleanup { destroy .c -} -returnCodes {error} -result {image "bogus" doesn't exist} +} -returnCodes {error} -result {image "bogus" does not exist} test button-1.157 {configuration option: "image" for radiobutton} -constraints { testImageType } -setup { @@ -1555,7 +1555,7 @@ test button-1.158 {configuration option: "image" for radiobutton} -setup { .r configure -image bogus } -cleanup { destroy .r -} -returnCodes {error} -result {image "bogus" doesn't exist} +} -returnCodes {error} -result {image "bogus" does not exist} test button-1.159 {configuration option: "indicatoron" for checkbutton} -setup { checkbutton .c -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold} @@ -2124,7 +2124,7 @@ test button-1.216 {configuration option: "selectimage" for checkbutton} -setup { .c configure -selectimage bogus } -cleanup { destroy .c -} -returnCodes {error} -result {image "bogus" doesn't exist} +} -returnCodes {error} -result {image "bogus" does not exist} test button-1.217 {configuration option: "selectimage" for radiobutton} -constraints { testImageType } -setup { @@ -2147,7 +2147,7 @@ test button-1.218 {configuration option: "selectimage" for radiobutton} -setup { .r configure -selectimage bogus } -cleanup { destroy .r -} -returnCodes {error} -result {image "bogus" doesn't exist} +} -returnCodes {error} -result {image "bogus" does not exist} test button-1.219 {configuration option: "state" for label} -setup { label .l -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold} @@ -2371,7 +2371,7 @@ test button-1.240 {configuration option: "tristateimage" for checkbutton} -setup .c configure -tristateimage bogus } -cleanup { destroy .c -} -returnCodes {error} -result {image "bogus" doesn't exist} +} -returnCodes {error} -result {image "bogus" does not exist} test button-1.241 {configuration option: "tristateimage" for radiobutton} -constraints { testImageType } -setup { @@ -2394,7 +2394,7 @@ test button-1.242 {configuration option: "tristateimage" for radiobutton} -setup .r configure -tristateimage bogus } -cleanup { destroy .r -} -returnCodes {error} -result {image "bogus" doesn't exist} +} -returnCodes {error} -result {image "bogus" does not exist} test button-1.243 {configuration option: "underline" for label} -setup { label .l -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold} @@ -2926,7 +2926,7 @@ test button-3.24 {ButtonWidgetCmd procedure, "deselect" option} -body { } -cleanup { destroy .c trace remove variable checkvar write bogusTrace -} -returnCodes {error} -result {can't set "checkvar": trace aborted} +} -match glob -returnCodes error -result {can*t set "checkvar": trace aborted} test button-3.25 {ButtonWidgetCmd procedure, "deselect" option} -body { checkbutton .c -variable checkvar -onvalue 1 -offvalue 0 set checkvar 1 @@ -2948,7 +2948,7 @@ test button-3.26 {ButtonWidgetCmd procedure, "deselect" option} -body { } -cleanup { destroy .r trace remove variable radiovar write bogusTrace -} -match {glob} -returnCodes {error} -result {can't set "radiovar": trace aborted} +} -match glob -returnCodes error -result {can*t set "radiovar": trace aborted} test button-3.27 {ButtonWidgetCmd procedure, "deselect" option} -body { radiobutton .r -variable radiovar -value red set radiovar red @@ -3086,7 +3086,7 @@ test button-3.44 {ButtonWidgetCmd procedure, "select" option} -body { } -cleanup { destroy .r trace remove variable radiovar write bogusTrace -} -returnCodes {error} -result {can't set "radiovar": trace aborted} +} -match glob -returnCodes error -result {can*t set "radiovar": trace aborted} test button-3.45 {ButtonWidgetCmd procedure, "select" option} -body { radiobutton .r -variable radiovar -value red set radiovar yellow @@ -3147,7 +3147,7 @@ test button-3.51 {ButtonWidgetCmd procedure, "toggle" option} -body { } -cleanup { destroy .c trace remove variable checkvar write bogusTrace -} -returnCodes {error} -result {can't set "checkvar": trace aborted} +} -match glob -returnCodes error -result {can*t set "checkvar": trace aborted} test button-3.52 {ButtonWidgetCmd procedure, "toggle" option} -body { checkbutton .c -variable checkvar -onvalue xyz -offvalue abc set checkvar xyz @@ -3169,7 +3169,7 @@ test button-3.53 {ButtonWidgetCmd procedure, "toggle" option} -body { } -cleanup { trace remove variable checkvar write bogusTrace destroy .c -} -returnCodes {error} -result {can't set "checkvar": trace aborted} +} -match glob -returnCodes error -result {can*t set "checkvar": trace aborted} test button-3.54 {ButtonWidgetCmd procedure, "toggle" option} -body { checkbutton .c -variable checkvar -onvalue xyz -offvalue abc set checkvar abc @@ -3179,7 +3179,7 @@ test button-3.54 {ButtonWidgetCmd procedure, "toggle" option} -body { } -cleanup { trace remove variable checkvar write bogusTrace destroy .c -} -match {glob} -result {{*trace aborted +} -match glob -result {{*trace aborted while executing * ".c toggle"} xyz} @@ -3192,7 +3192,7 @@ test button-3.55 {ButtonWidgetCmd procedure, "toggle" option} -setup { .c toggle } -cleanup { destroy .c -} -returnCodes {error} -result {can't set "checkvar": variable is array} +} -match glob -returnCodes {error} -result {can*t set "checkvar": variable is array} test button-3.56 {ButtonWidgetCmd procedure, "toggle" option} -setup { unset -nocomplain checkvar } -body { @@ -3203,7 +3203,7 @@ test button-3.56 {ButtonWidgetCmd procedure, "toggle" option} -setup { return $errorInfo } -cleanup { destroy .c -} -match {glob} -result {can't set "checkvar": variable is array +} -match glob -result {can*t set "checkvar": variable is array while executing ".c toggle"} @@ -3320,13 +3320,13 @@ test button-5.10 {ConfigureButton - error in setting variable} -setup { } -cleanup { destroy .r trace remove variable x write bogusTrace -} -returnCodes {error} -result {can't set "x": trace aborted} +} -match glob -returnCodes {error} -result {can*t set "x": trace aborted} test button-5.11 {ConfigureButton - bad image name} -body { button .b -image bogus } -cleanup { destroy .b -} -returnCodes {error} -result {image "bogus" doesn't exist} +} -returnCodes {error} -result {image "bogus" does not exist} test button-5.12 {ConfigureButton - setting variable from current text value} -setup { unset -nocomplain x @@ -3353,7 +3353,7 @@ test button-5.14 {ConfigureButton - variable handling} -setup { } -cleanup { trace remove variable x write bogusTrace destroy .r -} -returnCodes {error} -result {can't set "x": trace aborted} +} -match glob -returnCodes {error} -result {can*t set "x": trace aborted} test button-5.15 {ConfigureButton - variable handling} -setup { unset -nocomplain x } -body { @@ -3554,7 +3554,7 @@ test button-8.2 {TkInvokeButton procedure} -setup { } -cleanup { destroy .c trace remove variable x write bogusTrace -} -returnCodes {error} -result {can't set "x": trace aborted} +} -match glob -returnCodes {error} -result {can*t set "x": trace aborted} test button-8.3 {TkInvokeButton procedure} -setup { set x 0 } -body { @@ -3575,7 +3575,7 @@ test button-8.4 {TkInvokeButton procedure} -setup { } -cleanup { destroy .c trace remove variable x write bogusTrace -} -returnCodes {error} -result {can't set "x": trace aborted} +} -match glob -returnCodes {error} -result {can*t set "x": trace aborted} test button-8.5 {TkInvokeButton procedure} -setup { set x 1 } -body { @@ -3609,7 +3609,7 @@ test button-8.7 {TkInvokeButton procedure} -body { } -cleanup { destroy .r trace remove variable x write bogusTrace -} -returnCodes {error} -result {can't set "x": trace aborted} +} -match glob -returnCodes {error} -result {can*t set "x": trace aborted} test button-8.8 {TkInvokeButton procedure} -body { radiobutton .r -variable x -value red set x green @@ -3727,7 +3727,7 @@ test button-9.7 {ButtonVarProc procedure} -setup { } -cleanup { destroy .c } -result 1 -test button-9.8 {ButtonVarProc procedure, can't read variable} -setup { +test button-9.8 {ButtonVarProc procedure, cannot read variable} -setup { # This test does nothing but produce a core dump if there's a prbblem. unset -nocomplain a } -body { diff --git a/tests/canvImg.test b/tests/canvImg.test index bf532fe..2dded1c 100644 --- a/tests/canvImg.test +++ b/tests/canvImg.test @@ -44,7 +44,7 @@ test canvImg-1.4 {options for image items} -body { .c create image 50 50 -image unknown -tags i1 } -cleanup { .c delete all -} -returnCodes {error} -result {image "unknown" doesn't exist} +} -returnCodes {error} -result {image "unknown" does not exist} test canvImg-1.5 {options for image items} -constraints testImageType -setup { image create test foo .c delete all @@ -195,7 +195,7 @@ test canvImg-4.3 {ConfiugreImage procedure} -constraints testImageType -setup { } -cleanup { .c delete all image delete foo foo2 -} -returnCodes {error} -result {image "lousy" doesn't exist} +} -returnCodes {error} -result {image "lousy" does not exist} test canvImg-5.1 {DeleteImage procedure} -constraints testImageType -setup { diff --git a/tests/canvText.test b/tests/canvText.test index d685c45..a104a3d 100644 --- a/tests/canvText.test +++ b/tests/canvText.test @@ -42,7 +42,7 @@ test canvText-1.6 {configuration options: good value for "font"} -body { } -result {{Times 40} {Times 40}} test canvasText-1.7 {configuration options: bad value for "font"} -body { .c itemconfigure test -font {} -} -returnCodes error -result {font "" doesn't exist} +} -returnCodes error -result {font "" does not exist} test canvText-1.8 {configuration options: good value for "justify"} -body { .c itemconfigure test -justify left list [lindex [.c itemconfigure test -justify] 4] [.c itemcget test -justify] diff --git a/tests/clipboard.test b/tests/clipboard.test index 1e2b686..bb8a125 100644 --- a/tests/clipboard.test +++ b/tests/clipboard.test @@ -149,7 +149,7 @@ test clipboard-4.1 {ClipboardLostSel procedure} -setup { clipboard get } -cleanup { clipboard clear -} -returnCodes error -result {CLIPBOARD selection doesn't exist or form "STRING" not defined} +} -returnCodes error -result {CLIPBOARD selection does not exist or form "STRING" not defined} test clipboard-4.2 {ClipboardLostSel procedure} -setup { clipboard clear } -body { @@ -159,7 +159,7 @@ test clipboard-4.2 {ClipboardLostSel procedure} -setup { clipboard get } -cleanup { clipboard clear -} -returnCodes error -result {CLIPBOARD selection doesn't exist or form "STRING" not defined} +} -returnCodes error -result {CLIPBOARD selection does not exist or form "STRING" not defined} test clipboard-4.3 {ClipboardLostSel procedure} -setup { clipboard clear } -body { @@ -169,7 +169,7 @@ test clipboard-4.3 {ClipboardLostSel procedure} -setup { clipboard get -t TEST } -cleanup { clipboard clear -} -returnCodes error -result {CLIPBOARD selection doesn't exist or form "TEST" not defined} +} -returnCodes error -result {CLIPBOARD selection does not exist or form "TEST" not defined} test clipboard-4.4 {ClipboardLostSel procedure} -setup { clipboard clear } -body { @@ -180,7 +180,7 @@ test clipboard-4.4 {ClipboardLostSel procedure} -setup { clipboard get } -cleanup { clipboard clear -} -returnCodes error -result {CLIPBOARD selection doesn't exist or form "STRING" not defined} +} -returnCodes error -result {CLIPBOARD selection does not exist or form "STRING" not defined} test clipboard-4.5 {ClipboardLostSel procedure} -setup { clipboard clear } -body { @@ -191,7 +191,7 @@ test clipboard-4.5 {ClipboardLostSel procedure} -setup { clipboard get -t TEST } -cleanup { clipboard clear -} -returnCodes error -result {CLIPBOARD selection doesn't exist or form "TEST" not defined} +} -returnCodes error -result {CLIPBOARD selection does not exist or form "TEST" not defined} diff --git a/tests/embed.test b/tests/embed.test index 8a61baf..29d7177 100644 --- a/tests/embed.test +++ b/tests/embed.test @@ -68,7 +68,7 @@ test embed-1.4.nonwin {Tk_UseWindow procedure, -container must be set} -constrai toplevel .embd -use [winfo id .container] } -cleanup { deleteWindows -} -returnCodes error -result {window ".container" doesn't have -container option set} +} -returnCodes error -result {window ".container" does not have -container option set} # testing window embedding for other than win platforms test embed-1.5.nonwin {Tk_UseWindow procedure, -container must be set} -constraints { nonwin @@ -79,7 +79,7 @@ test embed-1.5.nonwin {Tk_UseWindow procedure, -container must be set} -constrai toplevel .embd -use [winfo id .container] } -cleanup { deleteWindows -} -returnCodes error -result {window ".container" doesn't have -container option set} +} -returnCodes error -result {window ".container" does not have -container option set} cleanupTests diff --git a/tests/entry.test b/tests/entry.test index 30f19b4..0fe8668 100644 --- a/tests/entry.test +++ b/tests/entry.test @@ -241,7 +241,7 @@ test entry-1.20 {configuration option: "font" for entry} -setup { .e configure -font {} } -cleanup { destroy .e -} -returnCodes {error} -result {font "" doesn't exist} +} -returnCodes {error} -result {font "" does not exist} test entry-1.21 {configuration option: "foreground" for entry} -setup { entry .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold} @@ -1173,7 +1173,7 @@ test entry-3.50 {EntryWidgetCmd procedure, "select clear" widget command} -setup selection get } -cleanup { destroy .e -} -returnCodes error -result {PRIMARY selection doesn't exist or form "STRING" not defined} +} -returnCodes error -result {PRIMARY selection does not exist or form "STRING" not defined} test entry-3.50.1 {EntryWidgetCmd procedure, "select clear" widget command} -setup { entry .e pack .e ; update idletasks @@ -1585,7 +1585,7 @@ test entry-3.82 {EntryWidgetCmd procedure} -setup { destroy .e } -returnCodes error -result {bad option "gorp": must be bbox, cget, configure, delete, get, icursor, index, insert, scan, selection, validate, or xview} -# The test below doesn't actually check anything directly, but if run +# The test below does not actually check anything directly, but if run # with Purify or some other memory-allocation-checking program it will # ensure that resources get properly freed. @@ -1670,7 +1670,7 @@ test entry-5.6 {ConfigureEntry procedure} -setup { selection get } -cleanup { destroy .e -} -returnCodes error -result {PRIMARY selection doesn't exist or form "STRING" not defined} +} -returnCodes error -result {PRIMARY selection does not exist or form "STRING" not defined} test entry-5.6.1 {ConfigureEntry procedure} -setup { entry .e pack .e ; update idletasks @@ -3534,7 +3534,7 @@ test entry-22.1 {lost namespaced textvar} -body { set ::test::foo } -cleanup { destroy .e -} -returnCodes error -result {can't read "::test::foo": no such variable} +} -match glob -returnCodes error -result {can*t read "::test::foo": no such variable} test entry-22.2 {lost namespaced textvar} -body { namespace eval test { variable foo {a b} } entry .e -textvariable ::test::foo @@ -3545,10 +3545,10 @@ test entry-22.2 {lost namespaced textvar} -body { list [.e get] [.e cget -textvar] $result1 $result2 $result3 } -cleanup { destroy .e -} -result [list "a bmo" ::test::foo \ - {can't set "::test::foo": parent namespace doesn't exist} \ - {can't set "::test::foo": parent namespace doesn't exist} \ - {can't read "::test::foo": no such variable}] +} -match glob -result [list "a bmo" ::test::foo \ + {can*t set "::test::foo": parent namespace does*t exist} \ + {can*t set "::test::foo": parent namespace does*t exist} \ + {can*t read "::test::foo": no such variable}] test entry-23.1 {error in trace proc attached to the textvariable} -setup { destroy .e @@ -3561,8 +3561,8 @@ test entry-23.1 {error in trace proc attached to the textvariable} -setup { list $result1 $result2 } -cleanup { destroy .e -} -result [list {can't set "myvar": Intentional error here!} \ - {can't set "myvar": Intentional error here!}] +} -match glob -result [list {can*t set "myvar": Intentional error here!} \ + {can*t set "myvar": Intentional error here!}] test entry-24.1 {textvariable lives in a non-existing namespace} -setup { destroy .e @@ -3571,7 +3571,7 @@ test entry-24.1 {textvariable lives in a non-existing namespace} -setup { set result1 } -cleanup { destroy .e -} -result {can't trace "thisnsdoesntexist::myvar": parent namespace doesn't exist} +} -match glob -result {can*t trace "thisnsdoesntexist::myvar": parent namespace does*t exist} test entry-25.1 {Bug [5d991b822e]} { # Want this not to segfault, or write to variable with empty name diff --git a/tests/font.test b/tests/font.test index 4c1f0de..4f2b3bb 100644 --- a/tests/font.test +++ b/tests/font.test @@ -97,7 +97,7 @@ test font-2.1 {TkFontPkgFree} -setup { lappend x [foo eval {catch {font families} msg; set msg}] } -cleanup { interp delete foo -} -result {{named font "wiggles" doesn't exist} {can't invoke "font" command: application has been destroyed}} +} -result {{named font "wiggles" does not exist} {cannot invoke "font" command: application has been destroyed}} test font-3.1 {font command: general} -body { @@ -133,7 +133,7 @@ test font-4.6 {font command: actual: arguments} -body { test font-4.7 {font command: actual: arguments} -constraints noExceed -body { # (tkfont == NULL) font actual "\{xyz" -} -returnCodes error -result "font \"{xyz\" doesn't exist" +} -returnCodes error -result "font \"{xyz\" does not exist" test font-4.8 {font command: actual: all attributes} -body { # not (objc > 3) so objPtr = NULL lindex [font actual {-family times}] 0 @@ -173,7 +173,7 @@ test font-5.1 {font command: configure} -body { test font-5.2 {font command: configure: non-existent font} -body { # (namedHashPtr == NULL) font configure xyz -} -returnCodes error -result {named font "xyz" doesn't exist} +} -returnCodes error -result {named font "xyz" does not exist} test font-5.3 {font command: configure: "deleted" font} -setup { destroy .t.f catch {font delete xyz} @@ -187,7 +187,7 @@ test font-5.3 {font command: configure: "deleted" font} -setup { font configure xyz } -cleanup { destroy .t.f -} -returnCodes error -result {named font "xyz" doesn't exist} +} -returnCodes error -result {named font "xyz" does not exist} test font-5.4 {font command: configure: get all options} -setup { catch {font delete xyz} } -body { @@ -330,7 +330,7 @@ test font-7.4 {font command: delete: non-existent} -setup { } -body { # (namedHashPtr == NULL) font delete xyz -} -returnCodes error -result {named font "xyz" doesn't exist} +} -returnCodes error -result {named font "xyz" does not exist} test font-7.5 {font command: delete: mark for later deletion} -setup { destroy .t.f catch {font delete xyz} @@ -345,7 +345,7 @@ test font-7.5 {font command: delete: mark for later deletion} -setup { font configure xyz } -cleanup { destroy .t.f -} -returnCodes error -result {named font "xyz" doesn't exist} +} -returnCodes error -result {named font "xyz" does not exist} test font-7.6 {font command: delete: mark for later deletion} -setup { destroy .t.f catch {font delete xyz} @@ -405,7 +405,7 @@ test font-9.3 {font command: measure: arguments} -body { test font-9.4 {font command: measure: arguments} -constraints noExceed -body { # (tkfont == NULL) font measure "\{xyz" abc -} -returnCodes error -result "font \"{xyz\" doesn't exist" +} -returnCodes error -result "font \"{xyz\" does not exist" test font-9.5 {font command: measure} -body { # Tk_TextWidth() expr {[font measure $fixed "abcdefg"] == [font measure $fixed "a"]*7 } @@ -443,7 +443,7 @@ test font-10.5 {font command: metrics: arguments} -body { test font-10.6 {font command: metrics: bad font} -constraints noExceed -body { # (tkfont == NULL) font metrics "\{xyz" -} -returnCodes error -result "font \"{xyz\" doesn't exist" +} -returnCodes error -result "font \"{xyz\" does not exist" test font-10.7 {font command: metrics: get all metrics} -setup { catch {unset a} } -body { @@ -707,7 +707,7 @@ test font-15.9 {Tk_AllocFontFromObj procedure: get attribute font} -setup { test font-15.10 {Tk_AllocFontFromObj procedure: no match} -constraints noExceed -body { # (ParseFontNameObj() != TCL_OK) font actual "\{xyz" -} -returnCodes error -result "font \"{xyz\" doesn't exist" +} -returnCodes error -result "font \"{xyz\" does not exist" test font-15.11 {Tk_AllocFontFromObj procedure: get attribute font} -body { # not (ParseFontNameObj() != TCL_OK) lindex [font actual {plan 9}] 0 @@ -1984,7 +1984,7 @@ test font-31.7 {TkIntersectAngledTextLayout procedure: bug [514ff64dd0]} -body { destroy .t.c -test font-32.1 {Tk_TextLayoutToPostscript: ensure buffer doesn't overflow} -setup { +test font-32.1 {Tk_TextLayoutToPostscript: ensure buffer does not overflow} -setup { destroy .t.c canvas .t.c -closeenough 0 .t.c create text 0 0 -tags text -anchor nw -just left -font "Courier -12" @@ -2230,7 +2230,7 @@ test font-37.7 {GetAttributeInfo procedure: overstrike} -setup { } -result 0 -# In tests below, one field is set to "xyz" so that font name doesn't +# In tests below, one field is set to "xyz" so that font name does not # look like a native X font, so that ParseFontNameObj or TkParseXLFD will # be called. @@ -2240,7 +2240,7 @@ test font-38.1 {ParseFontNameObj procedure: begins with -} -body { test font-38.2 {ParseFontNameObj procedure: begins with -*} -body { lindex [font actual -*-times-xyz-*-*-*-*-*-*-*-*-*-*-*] 1 } -result [font actual {times 0} -family] -test font-38.3 {ParseFontNameObj procedure: begins with -, doesn't look like list} -body { +test font-38.3 {ParseFontNameObj procedure: begins with -, does not look like list} -body { lindex [font actual -xyz-times-*-*-*-*-*-*-*-*-*-*-*-*] 1 } -result [font actual {times 0} -family] test font-38.4 {ParseFontNameObj procedure: begins with -, looks like list} -body { @@ -2254,10 +2254,10 @@ test font-38.6 {ParseFontNameObj procedure: begins with *} -body { } -result [font actual {times 0} -family] test font-38.7 {ParseFontNameObj procedure: arguments} -constraints noExceed -body { font actual "\{xyz" -} -returnCodes error -result "font \"{xyz\" doesn't exist" +} -returnCodes error -result "font \"{xyz\" does not exist" test font-38.8 {ParseFontNameObj procedure: arguments} -constraints noExceed -body { font actual "" -} -returnCodes error -result {font "" doesn't exist} +} -returnCodes error -result {font "" does not exist} test font-38.9 {ParseFontNameObj procedure: arguments} -body { font actual {times 20 xyz xyz} } -returnCodes error -result {unknown font style "xyz"} diff --git a/tests/frame.test b/tests/frame.test index 74768e4..f7c19d4 100644 --- a/tests/frame.test +++ b/tests/frame.test @@ -92,7 +92,7 @@ test frame-1.2 {frame configuration options} -setup { .f configure -class Different } -returnCodes error -cleanup { deleteWindows -} -result {can't modify -class option after widget is created} +} -result {cannot modify -class option after widget is created} test frame-1.3 {frame configuration options} -setup { deleteWindows } -body { @@ -108,7 +108,7 @@ test frame-1.4 {frame configuration options} -setup { .f configure -colormap . } -returnCodes error -cleanup { deleteWindows -} -result {can't modify -colormap option after widget is created} +} -result {cannot modify -colormap option after widget is created} test frame-1.5 {frame configuration options} -setup { deleteWindows } -body { @@ -124,7 +124,7 @@ test frame-1.6 {frame configuration options} -setup { .f configure -visual best } -returnCodes error -cleanup { deleteWindows -} -result {can't modify -visual option after widget is created} +} -result {cannot modify -visual option after widget is created} test frame-1.7 {frame configuration options} -setup { deleteWindows } -body { @@ -161,7 +161,7 @@ test frame-1.11 {frame configuration options} -setup { .f configure -container 1 } -returnCodes error -cleanup { deleteWindows -} -result {can't modify -container option after widget is created} +} -result {cannot modify -container option after widget is created} test frame-1.12 {frame configuration options} -setup { deleteWindows } -body { @@ -323,7 +323,7 @@ test frame-2.2 {toplevel configuration options} -setup { .t configure -class Another } -returnCodes error -cleanup { deleteWindows -} -result {can't modify -class option after widget is created} +} -result {cannot modify -class option after widget is created} test frame-2.3 {toplevel configuration options} -setup { deleteWindows } -body { @@ -341,7 +341,7 @@ test frame-2.4 {toplevel configuration options} -setup { .t configure -colormap . } -returnCodes error -cleanup { deleteWindows -} -result {can't modify -colormap option after widget is created} +} -result {cannot modify -colormap option after widget is created} test frame-2.5 {toplevel configuration options} -setup { deleteWindows } -body { @@ -350,7 +350,7 @@ test frame-2.5 {toplevel configuration options} -setup { .t configure -container 1 } -returnCodes error -cleanup { deleteWindows -} -result {can't modify -container option after widget is created} +} -result {cannot modify -container option after widget is created} test frame-2.6 {toplevel configuration options} -setup { deleteWindows } -body { @@ -376,7 +376,7 @@ test frame-2.8 {toplevel configuration options} -constraints win -setup { .t configure -use 0x44022 } -cleanup { deleteWindows -} -returnCodes error -result {window "0x44022" doesn't exist} +} -returnCodes error -result {window "0x44022" does not exist} test frame-2.9 {toplevel configuration options} -constraints win -setup { deleteWindows } -body { @@ -395,7 +395,7 @@ test frame-2.10 {toplevel configuration options} -constraints nonwin -setup { .t configure -use 0x44022 } -cleanup { deleteWindows -} -returnCodes error -result {can't modify -use option after widget is created} +} -returnCodes error -result {cannot modify -use option after widget is created} test frame-2.11 {toplevel configuration options} -constraints nonwin -setup { deleteWindows } -body { @@ -423,7 +423,7 @@ test frame-2.13 {toplevel configuration options} -setup { .t configure -visual best } -returnCodes error -cleanup { deleteWindows -} -result {can't modify -visual option after widget is created} +} -result {cannot modify -visual option after widget is created} test frame-2.14 {toplevel configuration options} -setup { deleteWindows } -body { @@ -452,7 +452,7 @@ test frame-2.16 {toplevel configuration options} -constraints {x11 haveDISPLAY} .t configure -screen another } -returnCodes error -cleanup { deleteWindows -} -result {can't modify -screen option after widget is created} +} -result {cannot modify -screen option after widget is created} test frame-2.17 {toplevel configuration options} -setup { deleteWindows } -body { @@ -1162,7 +1162,7 @@ test frame-13.2 {labelframe configuration options} -setup { .f configure -class Different } -returnCodes error -cleanup { deleteWindows -} -result {can't modify -class option after widget is created} +} -result {cannot modify -class option after widget is created} test frame-13.3 {labelframe configuration options} -setup { deleteWindows } -body { @@ -1213,7 +1213,7 @@ test frame-13.9 {labelframe configuration options} -setup { .f configure -container 1 } -returnCodes error -cleanup { deleteWindows -} -result {can't modify -container option after widget is created} +} -result {cannot modify -container option after widget is created} destroy .f labelframe .f test frame-13.10 {labelframe configuration options} -body { @@ -1509,7 +1509,7 @@ test frame-15.2 {TIP 262: frame background images} -setup { .f configure -backgroundimage gorp } -returnCodes error -cleanup { deleteWindows -} -result {image "gorp" doesn't exist} +} -result {image "gorp" does not exist} test frame-15.3 {TIP 262: frame background images} -setup { deleteWindows image create photo gorp -width 10 -height 10 @@ -1670,7 +1670,7 @@ test frame-15.8 {TIP 262: toplevel background images} -setup { } -body { toplevel .t -width 100 -height 100 update - # Used to verify that setting a background image doesn't change the widget size + # Used to verify that setting a background image does not change the widget size set w [winfo width .t] set h [winfo height .t] list [image inuse gorp] [.t configure -backgroundimage gorp;update] \ @@ -1689,7 +1689,7 @@ test frame-15.9 {TIP 262: toplevel background images} -setup { .t configure -backgroundimage gorp } -returnCodes error -cleanup { deleteWindows -} -result {image "gorp" doesn't exist} +} -result {image "gorp" does not exist} test frame-15.10 {TIP 262: toplevel background images} -setup { deleteWindows image create photo gorp -width 10 -height 10 diff --git a/tests/grid.test b/tests/grid.test index 9aa2f84..7e163b2 100644 --- a/tests/grid.test +++ b/tests/grid.test @@ -60,13 +60,13 @@ test grid-1.4 {basic argument checking} -body { } -returnCodes error -result {unexpected parameter "foo" in configure list: should be window name or option} test grid-1.5 {basic argument checking} -body { grid . -} -returnCodes error -result {can't manage ".": it's a top-level window} +} -returnCodes error -result {cannot manage ".": it's a top-level window} test grid-1.6 {basic argument checking} -body { grid x -} -returnCodes error -result {can't determine container window} +} -returnCodes error -result {cannot determine container window} test grid-1.7 {basic argument checking} -body { grid configure x -} -returnCodes error -result {can't determine container window} +} -returnCodes error -result {cannot determine container window} test grid-1.8 {basic argument checking} -body { button .b grid x .b @@ -179,7 +179,7 @@ test grid-3.7 {configure: basic argument checking} -body { grid .f .f.b } -cleanup { grid_reset 3.7 -} -returnCodes error -result {can't put ".f.b" inside "."} +} -returnCodes error -result {cannot put ".f.b" inside "."} test grid-3.8 {configure: basic argument checking} -body { button .b grid configure x .b @@ -198,7 +198,7 @@ test grid-3.10 {ConfigureContent procedure, bad -in option} -body { grid .f -in .f } -cleanup { grid_reset 3.10 -} -returnCodes error -result {window can't be managed in itself} +} -returnCodes error -result {window cannot be managed in itself} test grid-3.11 {prevent management loops} -body { frame .f1 frame .f2 @@ -206,7 +206,7 @@ test grid-3.11 {prevent management loops} -body { grid .f2 -in .f1 } -cleanup { grid_reset 3.11 -} -returnCodes error -result {can't put ".f2" inside ".f1": would cause management loop} +} -returnCodes error -result {cannot put ".f2" inside ".f1": would cause management loop} test grid-3.12 {prevent management loops} -body { frame .f1 frame .f2 @@ -216,7 +216,7 @@ test grid-3.12 {prevent management loops} -body { grid .f3 -in .f1 } -cleanup { grid_reset 3.12 -} -returnCodes error -result {can't put ".f3" inside ".f1": would cause management loop} +} -returnCodes error -result {cannot put ".f3" inside ".f1": would cause management loop} test grid-4.1 {forget: basic argument checking} -body { grid forget foo @@ -854,13 +854,13 @@ test grid-11.1 {default widget placement} -body { grid ^ } -cleanup { grid_reset 11.1 -} -returnCodes error -result {can't use '^', can't find container window} +} -returnCodes error -result {cannot use '^', cannot find container window} test grid-11.2 {default widget placement} -body { button .b grid .b ^ } -cleanup { grid_reset 11.2 -} -returnCodes error -result {can't find content to extend with "^"} +} -returnCodes error -result {cannot find content to extend with "^"} test grid-11.3 {default widget placement} -body { button .b grid .b - - .c @@ -915,7 +915,7 @@ test grid-11.9 {default widget placement} -body { grid .f x ^ } -cleanup { grid_reset 11.9 -} -returnCodes error -result {can't find content to extend with "^"} +} -returnCodes error -result {cannot find content to extend with "^"} test grid-11.10 {default widget placement} -body { foreach i {1 2 3} { frame .f$i -width 100 -height 50 -highlightthickness 0 -bg red @@ -1139,7 +1139,7 @@ test grid-13.1 {-in} -body { grid .f -in .f } -cleanup { grid_reset 13.1 -} -returnCodes error -result {window can't be managed in itself} +} -returnCodes error -result {window cannot be managed in itself} test grid-13.2 {-in} -body { frame .f -bg red list [winfo manager .f] \ @@ -1147,7 +1147,7 @@ test grid-13.2 {-in} -body { [winfo manager .f] } -cleanup { grid_reset 13.1.1 -} -result {{} 1 {window can't be managed in itself} {}} +} -result {{} 1 {window cannot be managed in itself} {}} test grid-13.3 {-in} -body { frame .f -bg red grid .f -in .bad @@ -1160,7 +1160,7 @@ test grid-13.4 {-in} -body { grid .f -in .top } -cleanup { grid_reset 13.3 -} -returnCodes error -result {can't put ".f" inside ".top"} +} -returnCodes error -result {cannot put ".f" inside ".top"} destroy .top test grid-13.5 {-ipadx} -body { frame .f -width 20 -height 20 -highlightthickness 0 -bg red diff --git a/tests/image.test b/tests/image.test index cdac20d..5ea88cc 100644 --- a/tests/image.test +++ b/tests/image.test @@ -31,7 +31,7 @@ test image-1.3 {Tk_ImageCmd procedure, "create" option} -body { } -returnCodes error -result {wrong # args: should be "image create type ?name? ?-option value ...?"} test image-1.4 {Tk_ImageCmd procedure, "create" option} -body { image c bad_type -} -returnCodes error -result {image type "bad_type" doesn't exist} +} -returnCodes error -result {image type "bad_type" does not exist} test image-1.5 {Tk_ImageCmd procedure, "create" option} -constraints { testImageType } -body { @@ -177,7 +177,7 @@ test image-2.3 {Tk_ImageCmd procedure, "delete" option} -constraints { image delete myimage gorp img2 } -cleanup { imageCleanup -} -returnCodes error -result {image "gorp" doesn't exist} +} -returnCodes error -result {image "gorp" does not exist} test image-2.4 {Tk_ImageCmd procedure, "delete" option} -constraints { testImageType } -setup { @@ -200,7 +200,7 @@ test image-3.2 {Tk_ImageCmd procedure, "height" option} -body { } -returnCodes error -result {wrong # args: should be "image height name"} test image-3.3 {Tk_ImageCmd procedure, "height" option} -body { image height foo -} -returnCodes error -result {image "foo" doesn't exist} +} -returnCodes error -result {image "foo" does not exist} test image-3.4 {Tk_ImageCmd procedure, "height" option} -constraints { testImageType } -setup { @@ -258,7 +258,7 @@ test image-5.2 {Tk_ImageCmd procedure, "type" option} -body { } -returnCodes error -result {wrong # args: should be "image type name"} test image-5.3 {Tk_ImageCmd procedure, "type" option} -body { image type foo -} -returnCodes error -result {image "foo" doesn't exist} +} -returnCodes error -result {image "foo" does not exist} test image-5.4 {Tk_ImageCmd procedure, "type" option} -constraints { testImageType @@ -281,7 +281,7 @@ test image-5.5 {Tk_ImageCmd procedure, "type" option} -constraints { image type myimage } -cleanup { imageCleanup -} -returnCodes error -result {image "myimage" doesn't exist} +} -returnCodes error -result {image "myimage" does not exist} test image-5.6 {Tk_ImageCmd procedure, "type" option} -constraints { testOldImageType } -setup { @@ -305,7 +305,7 @@ test image-5.7 {Tk_ImageCmd procedure, "type" option} -constraints { } -cleanup { .c delete all imageCleanup -} -returnCodes error -result {image "myimage" doesn't exist} +} -returnCodes error -result {image "myimage" does not exist} test image-6.1 {Tk_ImageCmd procedure, "types" option} -constraints { @@ -326,7 +326,7 @@ test image-7.2 {Tk_ImageCmd procedure, "width" option} -body { } -returnCodes error -result {wrong # args: should be "image width name"} test image-7.3 {Tk_ImageCmd procedure, "width" option} -body { image width foo -} -returnCodes error -result {image "foo" doesn't exist} +} -returnCodes error -result {image "foo" does not exist} test image-7.4 {Tk_ImageCmd procedure, "width" option} -constraints { testImageType } -setup { @@ -404,7 +404,7 @@ test image-10.1 {Tk_GetImage procedure} -setup { .c create image 100 10 -image bad_name } -cleanup { imageCleanup -} -returnCodes error -result {image "bad_name" doesn't exist} +} -returnCodes error -result {image "bad_name" does not exist} test image-10.2 {Tk_GetImage procedure} -constraints testImageType -setup { destroy .l imageCleanup @@ -416,7 +416,7 @@ test image-10.2 {Tk_GetImage procedure} -constraints testImageType -setup { } -cleanup { destroy .l imageCleanup -} -returnCodes error -result {image "mytest" doesn't exist} +} -returnCodes error -result {image "mytest" does not exist} test image-11.1 {Tk_FreeImage procedure} -constraints testImageType -setup { @@ -577,7 +577,7 @@ test image-13.2 {DeleteImage procedure} -constraints testImageType -setup { lappend x | [imageNames] | [catch {image delete foo} msg] | $msg | [imageNames] | } -cleanup { imageCleanup -} -result {{foo free} {foo free} {foo delete} | {} | 1 | {image "foo" doesn't exist} | {} |} +} -result {{foo free} {foo free} {foo delete} | {} | 1 | {image "foo" does not exist} | {} |} test image-13.3 {Tk_SizeOfImage procedure} -constraints testOldImageType -setup { imageCleanup @@ -603,7 +603,7 @@ test image-13.4 {DeleteImage procedure} -constraints testOldImageType -setup { } -cleanup { .c delete all imageCleanup -} -result {{foo free} {foo free} {foo delete} | {} | 1 | {image "foo" doesn't exist} | {} |} +} -result {{foo free} {foo free} {foo delete} | {} | 1 | {image "foo" does not exist} | {} |} test image-14.1 {image command vs hidden commands} -body { catch {image delete hidden} diff --git a/tests/imgBmap.test b/tests/imgBmap.test index ecb098e..9aaf674 100644 --- a/tests/imgBmap.test +++ b/tests/imgBmap.test @@ -157,7 +157,7 @@ test imageBmap-3.3 {ImgBmapConfigureModel procedure, memory de-allocation} -body test imageBmap-3.4 {ImgBmapConfigureModel procedure} -body { image create bitmap i1 i1 configure -maskdata $data2 -} -returnCodes error -result {can't have mask without bitmap} +} -returnCodes error -result {cannot have mask without bitmap} test imageBmap-3.5 {ImgBmapConfigureModel procedure} -body { image create bitmap i1 -data $data1 -maskdata { #define foo_width 8 diff --git a/tests/imgPhoto.test b/tests/imgPhoto.test index 0a2cf7f..fb363df 100644 --- a/tests/imgPhoto.test +++ b/tests/imgPhoto.test @@ -365,7 +365,7 @@ test imgPhoto-4.12 {ImgPhotoCmd procedure: copy option} -setup { photo1 copy blah } -returnCodes error -cleanup { image delete photo1 -} -result {image "blah" doesn't exist or is not a photo image} +} -result {image "blah" does not exist or is not a photo image} test imgPhoto-4.13 {ImgPhotoCmd procedure: copy option} -setup { image create photo photo1 image create photo photo2 @@ -1431,7 +1431,7 @@ test imgPhoto-8.3 {ImgPhotoDelete procedure, name cleanup} -body { photo1 copy photo2 } -returnCodes error -cleanup { imageCleanup -} -result {image "photo2" doesn't exist or is not a photo image} +} -result {image "photo2" does not exist or is not a photo image} test imgPhoto-9.1 {ImgPhotoCmdDeletedProc procedure} -body { image create photo photo2 -file $teapotPhotoFile @@ -1488,7 +1488,7 @@ test imgPhoto-11.1 {Tk_FindPhoto} -setup { photo1 copy i1 } -cleanup { imageCleanup -} -returnCodes error -result {image "i1" doesn't exist or is not a photo image} +} -returnCodes error -result {image "i1" does not exist or is not a photo image} test imgPhoto-12.1 {Tk_PhotoPutZoomedBlock} -body { image create photo p3 -file $teapotPhotoFile @@ -1732,7 +1732,7 @@ test imgPhoto-15.1 {photo images can fail to allocate memory gracefully} -constr image create photo -width 32000 -height 32000 } -returnCodes error -result {not enough free memory for image buffer} -test imgPhoto-16.1 {copying to self doesn't access freed memory} -setup { +test imgPhoto-16.1 {copying to self does not access freed memory} -setup { set i [image create photo] } -body { # Bug 877950 makes this crash when trying to copy out of a deallocated diff --git a/tests/listbox.test b/tests/listbox.test index c02f389..2a74290 100644 --- a/tests/listbox.test +++ b/tests/listbox.test @@ -1304,7 +1304,7 @@ test listbox-4.5 {-exportselection option} -setup { lappend x [catch {selection get} msg] $msg [.l curselection] } -cleanup { deleteWindows -} -result {0 el1 1 1 {PRIMARY selection doesn't exist or form "STRING" not defined} 1 1 {PRIMARY selection doesn't exist or form "STRING" not defined} {} 1 {PRIMARY selection doesn't exist or form "STRING" not defined} {1 2 3} 0 {el1 +} -result {0 el1 1 1 {PRIMARY selection does not exist or form "STRING" not defined} 1 1 {PRIMARY selection does not exist or form "STRING" not defined} {} 1 {PRIMARY selection does not exist or form "STRING" not defined} {1 2 3} 0 {el1 el2 el3} {1 2 3}} test listbox-4.6 {ConfigureListbox procedure} -constraints { @@ -1485,8 +1485,8 @@ test listbox-4.19 {ConfigureListbox, no listvar -> bad non-existent listvar} -se list [.l2 get 0 end] [.l2 cget -listvar] $foo $result } -cleanup { destroy .l2 -} -result [list [list a b c d] foo [list a b c d] \ - {can't set "::zoo::bar::foo": parent namespace doesn't exist}] +} -match glob -result [list [list a b c d] foo [list a b c d] \ + {can*t set "::zoo::bar::foo": parent namespace does*t exist}] # No tests for DisplayListbox: I don't know how to test this procedure. @@ -1687,8 +1687,8 @@ test listbox-6.15 {InsertEls procedure, lost namespaced listvar} -body { list [.l2 get 0 end] [.l2 cget -listvar] $result } -cleanup { destroy .l2 -} -result [list [list a b c e f] ::test::foo \ - {can't read "::test::foo": no such variable}] +} -match glob -result [list [list a b c e f] ::test::foo \ + {can*t read "::test::foo": no such variable}] test listbox-7.1 {DeleteEls procedure} -body { @@ -2703,7 +2703,7 @@ test listbox-21.11 {ListboxListVarProc, bad list} -setup { set result } -cleanup { destroy .l -} -result {can't set "x": invalid listvar value} +} -match glob -result {can*t set "x": invalid listvar value} test listbox-21.12 {ListboxListVarProc, cleanup item attributes} -setup { destroy .l } -body { diff --git a/tests/menu.test b/tests/menu.test index 72369b5..2a4972f 100644 --- a/tests/menu.test +++ b/tests/menu.test @@ -746,11 +746,11 @@ test menu-2.127 {entry configuration options 0 -image bogus tearoff} -body { test menu-2.128 {entry configuration options 1 -image bogus command} -body { .m1 entryconfigure 1 -image bogus -} -returnCodes error -result {image "bogus" doesn't exist} +} -returnCodes error -result {image "bogus" does not exist} test menu-2.129 {entry configuration options 2 -image bogus cascade} -body { .m1 entryconfigure 2 -image bogus -} -returnCodes error -result {image "bogus" doesn't exist} +} -returnCodes error -result {image "bogus" does not exist} test menu-2.130 {entry configuration options 3 -image bogus separator} -body { .m1 entryconfigure 3 -image bogus @@ -758,11 +758,11 @@ test menu-2.130 {entry configuration options 3 -image bogus separator} -body { test menu-2.131 {entry configuration options 4 -image bogus checkbutton} -body { .m1 entryconfigure 4 -image bogus -} -returnCodes error -result {image "bogus" doesn't exist} +} -returnCodes error -result {image "bogus" does not exist} test menu-2.132 {entry configuration options 5 -image bogus radiobutton} -body { .m1 entryconfigure 5 -image bogus -} -returnCodes error -result {image "bogus" doesn't exist} +} -returnCodes error -result {image "bogus" does not exist} test menu-2.133 {entry configuration options 0 -image {} tearoff} -body { .m1 entryconfigure 0 -image @@ -1027,11 +1027,11 @@ test menu-2.190 {entry configuration options 3 -selectimage bogus separator} -bo test menu-2.191 {entry configuration options 4 -selectimage bogus checkbutton} -body { .m1 entryconfigure 4 -selectimage bogus -} -returnCodes error -result {image "bogus" doesn't exist} +} -returnCodes error -result {image "bogus" does not exist} test menu-2.192 {entry configuration options 5 -selectimage bogus radiobutton} -body { .m1 entryconfigure 5 -selectimage bogus -} -returnCodes error -result {image "bogus" doesn't exist} +} -returnCodes error -result {image "bogus" does not exist} test menu-2.193 {entry configuration options 0 -selectimage {} tearoff} -body { .m1 entryconfigure 0 -selectimage @@ -3968,7 +3968,7 @@ test menu-32.8 {Ensure all menu clone commands are deleted} -setup { } -cleanup { deleteWindows } -result {} -test menu-32.9 {Ensure deleting of clones doesn't corrupt menu refs} -setup { +test menu-32.9 {Ensure deleting of clones does not corrupt menu refs} -setup { set res {} deleteWindows } -body { diff --git a/tests/menubut.test b/tests/menubut.test index 028341f..75d60db 100644 --- a/tests/menubut.test +++ b/tests/menubut.test @@ -207,7 +207,7 @@ test menubutton-1.37 {configuration options} -setup { .mb configure -image bogus } -cleanup { .mb configure -image [lindex [.mb configure -image] 3] -} -returnCodes error -result {image "bogus" doesn't exist} +} -returnCodes error -result {image "bogus" does not exist} test menubutton-1.38 {configuration options} -body { .mb configure -indicatoron yes .mb cget -indicatoron diff --git a/tests/message.test b/tests/message.test index 4abe2db..63dcbe7 100644 --- a/tests/message.test +++ b/tests/message.test @@ -190,7 +190,7 @@ test message-1.18 {configuration option: "font"} -setup { .m configure -font {} } -cleanup { destroy .m -} -returnCodes {error} -result {font "" doesn't exist} +} -returnCodes {error} -result {font "" does not exist} test message-1.19 {configuration option: "-foreground"} -setup { message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold} diff --git a/tests/pack.test b/tests/pack.test index 201bf9f..720f313 100644 --- a/tests/pack.test +++ b/tests/pack.test @@ -966,7 +966,7 @@ test pack-10.4 {bad -in window does not change container window} -setup { } -body { winfo manager .pack.a pack .pack.a -in .pack.a -} -returnCodes error -result {can't pack ".pack.a" inside itself} +} -returnCodes error -result {cannot pack ".pack.a" inside itself} test pack-10.5 {prevent management loops} -body { frame .f1 frame .f2 @@ -975,7 +975,7 @@ test pack-10.5 {prevent management loops} -body { } -cleanup { destroy .f1 destroy .f2 -} -returnCodes error -result {can't put ".f2" inside ".f1": would cause management loop} +} -returnCodes error -result {cannot put ".f2" inside ".f1": would cause management loop} test pack-10.6 {prevent management loops} -body { frame .f1 frame .f2 @@ -987,7 +987,7 @@ test pack-10.6 {prevent management loops} -body { destroy .f1 destroy .f2 destroy .f3 -} -returnCodes error -result {can't put ".f3" inside ".f1": would cause management loop} +} -returnCodes error -result {cannot put ".f3" inside ".f1": would cause management loop} test pack-11.1 {info option} -setup { pack forget .pack.a .pack.b .pack.c .pack.d @@ -1147,7 +1147,7 @@ test pack-12.6 {command options and errors} -setup { pack forget .pack.a .pack.b .pack.c .pack.d } -body { pack .pack -} -returnCodes error -result {can't pack ".pack": it's a top-level window} +} -returnCodes error -result {cannot pack ".pack": it's a top-level window} test pack-12.7 {command options and errors} -setup { pack forget .pack.a .pack.b .pack.c .pack.d } -body { @@ -1283,18 +1283,18 @@ test pack-12.33 {command options and errors} -setup { pack forget .pack.a .pack.b .pack.c .pack.d } -body { pack .pack.a -in . -} -returnCodes error -result {can't pack ".pack.a" inside "."} +} -returnCodes error -result {cannot pack ".pack.a" inside "."} test pack-12.34 {command options and errors} -setup { pack forget .pack.a .pack.b .pack.c .pack.d } -body { frame .pack.a.a pack .pack.a.a -in .pack.b -} -returnCodes error -result {can't pack ".pack.a.a" inside ".pack.b"} +} -returnCodes error -result {cannot pack ".pack.a.a" inside ".pack.b"} test pack-12.35 {command options and errors} -setup { pack forget .pack.a .pack.b .pack.c .pack.d } -body { pack .pack.a -in .pack.a -} -returnCodes error -result {can't pack ".pack.a" inside itself} +} -returnCodes error -result {cannot pack ".pack.a" inside itself} test pack-12.36 {command options and errors} -setup { pack forget .pack.a .pack.b .pack.c .pack.d } -body { diff --git a/tests/panedwindow.test b/tests/panedwindow.test index 45c6deb..7d46ff3 100644 --- a/tests/panedwindow.test +++ b/tests/panedwindow.test @@ -1704,7 +1704,7 @@ test panedwindow-17.11 {MoveSash, move left} -setup { } -cleanup { deleteWindows } -result [list 42 42 {10 0}] -test panedwindow-17.12 {MoveSash, move left, can't move outside of window} -setup { +test panedwindow-17.12 {MoveSash, move left, cannot move outside of window} -setup { deleteWindows } -body { panedwindow .p -showhandle false -borderwidth 0 -sashpad 0 -sashwidth 2 @@ -2028,7 +2028,7 @@ test panedwindow-18.11 {MoveSash, move up} -setup { } -cleanup { deleteWindows } -result [list 42 42 {0 10}] -test panedwindow-18.12 {MoveSash, move up, can't move outside of window} -setup { +test panedwindow-18.12 {MoveSash, move up, cannot move outside of window} -setup { deleteWindows } -body { panedwindow .p -showhandle false -borderwidth 0 -sashpad 0 -sashwidth 2 \ @@ -4565,14 +4565,14 @@ test panedwindow-22.2 {PanedWindowReqProc, react to pane geometry changes} -setu } -result 10 -test panedwindow-23.1 {ConfigurePanes, can't add panedwindow to itself} -setup { +test panedwindow-23.1 {ConfigurePanes, cannot add panedwindow to itself} -setup { deleteWindows } -body { panedwindow .p .p add .p } -cleanup { deleteWindows -} -returnCodes error -result {can't add .p to itself} +} -returnCodes error -result {cannot add .p to itself} test panedwindow-23.2 {ConfigurePanes, bad window throws error} -setup { deleteWindows } -body { @@ -4863,7 +4863,7 @@ test panedwindow-23.24 {ConfigurePanes, panedwindow cannot manage toplevels} -se .p add .t } -cleanup { deleteWindows -} -returnCodes error -result {can't add toplevel .t to .p} +} -returnCodes error -result {cannot add toplevel .t to .p} test panedwindow-23.25 {ConfigurePanes, restrict possible panes} -setup { deleteWindows } -body { @@ -4873,7 +4873,7 @@ test panedwindow-23.25 {ConfigurePanes, restrict possible panes} -setup { .p add .f.b } -cleanup { deleteWindows -} -returnCodes error -result {can't add .f.b to .p} +} -returnCodes error -result {cannot add .f.b to .p} test panedwindow-23.26 {ConfigurePanes, restrict possible panes} -setup { deleteWindows } -body { diff --git a/tests/place.test b/tests/place.test index fae275a..419e7ce 100644 --- a/tests/place.test +++ b/tests/place.test @@ -102,7 +102,7 @@ test place-4.1 {ConfigureContent procedure, bad -in options} -setup { place forget .t.f2 } -body { place .t.f2 -in .t.f2 -} -returnCodes error -result {can't place ".t.f2" relative to itself} +} -returnCodes error -result {cannot place ".t.f2" relative to itself} test place-4.2 {ConfigureContent procedure, bad -in option} -setup { place forget .t.f2 } -body { @@ -115,23 +115,23 @@ test place-4.3 {ConfigureContent procedure, bad -in option} -setup { } -body { winfo manager .t.f2 place .t.f2 -in .t.f2 -} -returnCodes error -result {can't place ".t.f2" relative to itself} +} -returnCodes error -result {cannot place ".t.f2" relative to itself} test place-4.4 {ConfigureContent procedure, bad -in option} -setup { place forget .t.f2 } -body { place .t.f2 -in . -} -returnCodes error -result {can't place ".t.f2" relative to "."} +} -returnCodes error -result {cannot place ".t.f2" relative to "."} test place-4.5 {ConfigureContent procedure, bad -in option} -setup { } -body { frame .t.f1 place .t.f1 -in .t.f1 -} -returnCodes error -result {can't place ".t.f1" relative to itself} +} -returnCodes error -result {cannot place ".t.f1" relative to itself} test place-4.6 {prevent management loops} -setup { place forget .t.f1 } -body { place .t.f1 -in .t.f2 place .t.f2 -in .t.f1 -} -returnCodes error -result {can't put ".t.f2" inside ".t.f1": would cause management loop} +} -returnCodes error -result {cannot put ".t.f2" inside ".t.f1": would cause management loop} test place-4.7 {prevent management loops} -setup { place forget .t.f1 place forget .t.f2 @@ -140,7 +140,7 @@ test place-4.7 {prevent management loops} -setup { place .t.f1 -in .t.f2 place .t.f2 -in .t.f3 place .t.f3 -in .t.f1 -} -returnCodes error -result {can't put ".t.f3" inside ".t.f1": would cause management loop} +} -returnCodes error -result {cannot put ".t.f3" inside ".t.f1": would cause management loop} test place-5.1 {ConfigureContent procedure, -relwidth option} -body { place .t.f2 -relwidth abcd diff --git a/tests/raise.test b/tests/raise.test index 7e6b0bd..a2de1ad 100644 --- a/tests/raise.test +++ b/tests/raise.test @@ -175,7 +175,7 @@ test raise-4.2 {raise relative to nephews} -setup { raise .raise.a .raise2 } -cleanup { destroy .raise2 -} -returnCodes error -result {can't raise ".raise.a" above ".raise2"} +} -returnCodes error -result {cannot raise ".raise.a" above ".raise2"} test raise-5.1 {lower internal windows} -body { @@ -205,7 +205,7 @@ test raise-5.4 {lower internal windows} -setup { lower .raise.a .raise2 } -cleanup { destroy .raise2 -} -returnCodes error -result {can't lower ".raise.a" below ".raise2"} +} -returnCodes error -result {cannot lower ".raise.a" below ".raise2"} test raise-6.1 {raise/lower toplevel windows} -constraints { diff --git a/tests/scale.test b/tests/scale.test index f08015e..3fe3b0c 100644 --- a/tests/scale.test +++ b/tests/scale.test @@ -1245,7 +1245,7 @@ test scale-15.3 {ScaleVarProc procedure} -setup { set y 40q } -cleanup { deleteWindows -} -returnCodes error -result {can't set "y": can't assign non-numeric value to scale variable} +} -match glob -returnCodes error -result {can*t set "y": can*t assign non-numeric value to scale variable} test scale-15.4 {ScaleVarProc procedure} -setup { deleteWindows } -body { @@ -1266,7 +1266,7 @@ test scale-15.5 {ScaleVarProc procedure} -setup { set y x } -cleanup { deleteWindows -} -returnCodes error -result {can't set "y": can't assign non-numeric value to scale variable} +} -returnCodes error -match glob -result {can*t set "y": can*t assign non-numeric value to scale variable} test scale-15.6 {ScaleVarProc procedure} -setup { deleteWindows } -body { diff --git a/tests/select.test b/tests/select.test index 55f9184..52f91b5 100644 --- a/tests/select.test +++ b/tests/select.test @@ -465,7 +465,7 @@ test select-5.1 {Tk_GetSelection procedure} -returnCodes error -setup { setup } -body { selection get TEST -} -result {PRIMARY selection doesn't exist or form "TEST" not defined} +} -result {PRIMARY selection does not exist or form "TEST" not defined} test select-5.2 {Tk_GetSelection procedure} -setup { setup } -body { @@ -484,7 +484,7 @@ test select-5.4 {Tk_GetSelection procedure} -setup { } -returnCodes error -body { selection handle .f1 ERROR errHandler selection get ERROR -} -result {PRIMARY selection doesn't exist or form "ERROR" not defined} +} -result {PRIMARY selection does not exist or form "ERROR" not defined} test select-5.5 {Tk_GetSelection procedure} -setup { setup } -body { @@ -503,7 +503,7 @@ test select-5.6 {Tk_GetSelection procedure} -setup { handler $type $offset $count }} STRING} selection get -} -result {PRIMARY selection doesn't exist or form "STRING" not defined} +} -result {PRIMARY selection does not exist or form "STRING" not defined} test select-5.7 {Tk_GetSelection procedure} -setup { setup } -returnCodes error -body { @@ -514,7 +514,7 @@ test select-5.7 {Tk_GetSelection procedure} -setup { handler $type $offset $count }} STRING} selection get -} -result {PRIMARY selection doesn't exist or form "STRING" not defined} +} -result {PRIMARY selection does not exist or form "STRING" not defined} test select-5.8 {Tk_GetSelection procedure} -setup { setup } -body { @@ -525,7 +525,7 @@ test select-5.8 {Tk_GetSelection procedure} -setup { handler $type $offset $count }} STRING} list [selection get] $selInfo [catch {selection get} msg] $msg -} -result "$longValue {STRING 0 4000 STRING 4000 4000 STRING 8000 4000 STRING 12000 4000 STRING 16000 4000} 1 {PRIMARY selection doesn't exist or form \"STRING\" not defined}" +} -result "$longValue {STRING 0 4000 STRING 4000 4000 STRING 8000 4000 STRING 12000 4000 STRING 16000 4000} 1 {PRIMARY selection does not exist or form \"STRING\" not defined}" test select-5.9 {Tk_GetSelection procedure} -constraints x11 -setup { setup setupbg @@ -585,7 +585,7 @@ test select-5.12 {Tk_GetSelection procedure} -constraints { set selInfo "" lappend result [catch {selection get -displayof .f2 TEST} msg] $msg \ $selInfo -} -result {0 {Test value} {TEST 0 4000} 1 {PRIMARY selection doesn't exist or form "TEST" not defined} {}} +} -result {0 {Test value} {TEST 0 4000} 1 {PRIMARY selection does not exist or form "TEST" not defined} {}} test select-5.13 {Tk_GetSelection procedure} -constraints { x11 altDisplay } -setup { @@ -627,7 +627,7 @@ test select-5.14 {Tk_GetSelection procedure} -constraints { lappend result [dobg "selection get TEST"] cleanupbg lappend result $selInfo -} -result {{PRIMARY selection doesn't exist or form "TEST" not defined} {Test value2} {TEST 0 4000}} +} -result {{PRIMARY selection does not exist or form "TEST" not defined} {Test value2} {TEST 0 4000}} test select-5.15 {Tk_GetSelection procedure} -setup { setup if {[llength [info command ::bgerror]]} { @@ -643,7 +643,7 @@ test select-5.15 {Tk_GetSelection procedure} -setup { if {[llength [info command ::TMPbgerror]]} { rename ::TMPbgerror ::bgerror } -} -result {1 {PRIMARY selection doesn't exist or form "ERROR" not defined} {} {selection handler aborted}} +} -result {1 {PRIMARY selection does not exist or form "ERROR" not defined} {} {selection handler aborted}} ############################################################################## @@ -851,7 +851,7 @@ test select-6.39 {Tk_SelectionCmd procedure} -returnCodes error -body { ############################################################################## # This test is non-portable because some old X11/News servers ignore a -# selection request when the window doesn't exist, which causes a different +# selection request when the window does not exist, which causes a different # error message. test select-7.1 {TkSelDeadWindow procedure} -constraints nonPortable -setup { setup @@ -860,7 +860,7 @@ test select-7.1 {TkSelDeadWindow procedure} -constraints nonPortable -setup { set result [selection own] destroy .f1 lappend result [selection own] [catch {selection get} msg] $msg -} -result {.f1 {} 1 {PRIMARY selection doesn't exist or form "STRING" not defined}} +} -result {.f1 {} 1 {PRIMARY selection does not exist or form "STRING" not defined}} ############################################################################## @@ -982,7 +982,7 @@ test select-10.1 {ConvertSelection procedure, race with selection clear} -constr # a "broken pipe" error when Tk was actually [load]ed in the child. catch {close $fd} lappend x $selInfo -} -result {{1:PRIMARY selection doesn't exist or form "STRING" not defined} {}} +} -result {{1:PRIMARY selection does not exist or form "STRING" not defined} {}} test select-10.2 {ConvertSelection procedure} -constraints x11 -setup { setup setupbg @@ -1003,7 +1003,7 @@ test select-10.3 {ConvertSelection procedure} -constraints x11 -setup { dobg {selection get ERROR} } -cleanup { cleanupbg -} -result {PRIMARY selection doesn't exist or form "ERROR" not defined} +} -result {PRIMARY selection does not exist or form "ERROR" not defined} # testing timers # This one hangs in Exceed test select-10.4 {ConvertSelection procedure} -constraints { @@ -1035,7 +1035,7 @@ test select-10.5 {ConvertSelection procedure, reentrancy issues} -constraints { lappend result [dobg {selection get}] cleanupbg lappend result $selInfo -} -result {{PRIMARY selection doesn't exist or form "STRING" not defined} {.f1 STRING 0 4000}} +} -result {{PRIMARY selection does not exist or form "STRING" not defined} {.f1 STRING 0 4000}} test select-10.6 {ConvertSelection procedure, reentrancy issues} -constraints { x11 failsOnUbuntu } -setup { @@ -1055,7 +1055,7 @@ test select-10.6 {ConvertSelection procedure, reentrancy issues} -constraints { lappend result $selInfo } -cleanup { rename weirdHandler {} -} -result {{PRIMARY selection doesn't exist or form "STRING" not defined} {STRING 0 4000}} +} -result {{PRIMARY selection does not exist or form "STRING" not defined} {STRING 0 4000}} ############################################################################## @@ -1158,7 +1158,7 @@ test select-13.1 {SelectionSize procedure, handler deleted} -constraints { lappend result [dobg {selection get}] cleanupbg lappend result $selInfo -} -result {{PRIMARY selection doesn't exist or form "STRING" not defined} {.f1 STRING 0 4000 .f1 STRING 4000 4000}} +} -result {{PRIMARY selection does not exist or form "STRING" not defined} {.f1 STRING 0 4000 .f1 STRING 4000 4000}} test select-14.1 {Bug [73ba07efcd]: Use correct property type when handling MULTIPLE conversion requests} -constraints { cliboardManagerPresent diff --git a/tests/spinbox.test b/tests/spinbox.test index 6cb52e9..e6adf22 100644 --- a/tests/spinbox.test +++ b/tests/spinbox.test @@ -336,7 +336,7 @@ test spinbox-1.27 {configuration option: "font" for spinbox} -setup { .e configure -font {} } -cleanup { destroy .e -} -returnCodes {error} -result {font "" doesn't exist} +} -returnCodes {error} -result {font "" does not exist} test spinbox-1.28 {configuration option: "foreground"} -setup { spinbox .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12} \ @@ -1509,7 +1509,7 @@ test spinbox-3.50 {SpinboxWidgetCmd procedure, "select clear" widget command} -s selection get } -cleanup { destroy .e -} -returnCodes error -result {PRIMARY selection doesn't exist or form "STRING" not defined} +} -returnCodes error -result {PRIMARY selection does not exist or form "STRING" not defined} test spinbox-3.50.1 {SpinboxWidgetCmd procedure, "select clear" widget command} -setup { spinbox .e pack .e @@ -1993,7 +1993,7 @@ test spinbox-5.6 {ConfigureSpinbox procedure} -setup { selection get } -cleanup { destroy .e -} -returnCodes error -result {PRIMARY selection doesn't exist or form "STRING" not defined} +} -returnCodes error -result {PRIMARY selection does not exist or form "STRING" not defined} test spinbox-5.6.1 {ConfigureSpinbox procedure} -setup { spinbox .e pack .e @@ -3875,10 +3875,10 @@ test spinbox-24.1 {error in trace proc attached to the textvariable} -setup { list $result1 $result2 $result3 $result4 } -cleanup { destroy .s -} -result [list {can't set "myvar": Intentional error here!} \ - {can't set "myvar": Intentional error here!} \ - {can't set "myvar": Intentional error here!} \ - {can't set "myvar": Intentional error here!}] +} -match glob -result [list {can*t set "myvar": Intentional error here!} \ + {can*t set "myvar": Intentional error here!} \ + {can*t set "myvar": Intentional error here!} \ + {can*t set "myvar": Intentional error here!}] test spinbox-25.1 {textvariable lives in a non-existing namespace} -setup { destroy .s @@ -3887,7 +3887,7 @@ test spinbox-25.1 {textvariable lives in a non-existing namespace} -setup { set result1 } -cleanup { destroy .s -} -result {can't trace "thisnsdoesntexist::myvar": parent namespace doesn't exist} +} -match glob -result {can*t trace "thisnsdoesntexist::myvar": parent namespace does*t exist} test spinbox-25.3 {Bugs [2a32225cd1] and [9fa3e08243]} -setup { destroy .s pack [spinbox .s] diff --git a/tests/systray.test b/tests/systray.test index a87e6ef..cec6a2f 100644 --- a/tests/systray.test +++ b/tests/systray.test @@ -143,7 +143,7 @@ test systray-14 {systray icon creation, create one per interp, visibiliy checks} tk systray destroy image delete _book interp delete second -} -returnCodes {error} -result {image "_book" doesn't exist} +} -returnCodes {error} -result {image "_book" does not exist} test systray-15 {systray icon creation, create one per interp} -setup { image create photo _book -data R0lGODlhDwAPAKIAAP//////AP8AAMDAwICAgAAAAAAAAAAAACwAAAAADwAPAAADSQhA2u5ksPeKABKSCaya29d4WKgERFF0l1IMQCAKatvBJ0OTdzzXI1xMB3TBZAvATtB6NSLKleXi3OBoLqrVgc0yv+DVSEUuFxIAOw== diff --git a/tests/text.test b/tests/text.test index 2303729..d3d7ad8 100644 --- a/tests/text.test +++ b/tests/text.test @@ -3454,7 +3454,7 @@ test text-14.16 {ConfigureText procedure} -body { selection get } -cleanup { destroy .t .t2 -} -returnCodes error -result {PRIMARY selection doesn't exist or form "STRING" not defined} +} -returnCodes error -result {PRIMARY selection does not exist or form "STRING" not defined} test text-14.17 {ConfigureText procedure} -body { text .t entry .t.e @@ -4014,7 +4014,7 @@ test text-21.3 {TkTextLostSelection procedure} -body { selection get } -cleanup { destroy .t -} -returnCodes error -result {PRIMARY selection doesn't exist or form "STRING" not defined} +} -returnCodes error -result {PRIMARY selection does not exist or form "STRING" not defined} test text-21.4 {TkTextLostSelection procedure} -body { text .t .t insert 1.0 "abcdef\nghijk\n1234" @@ -4486,7 +4486,7 @@ test text-22.56 {TextSearchCmd procedure, error setting variable} -body { .t search -count a(2) xyz 1.0 } -cleanup { destroy .t -} -returnCodes {error} -result {can't set "a(2)": variable isn't array} +} -returnCodes {error} -match glob -result {can*t set "a(2)": variable isn't array} test text-22.57 {TextSearchCmd procedure, wrap-around} -body { text .t .t insert end "xxyz xyz x. the\nfoo -forward bar xxxxx BaR foo\nxyz xxyzx" @@ -7419,7 +7419,7 @@ test text-31.19 {peer widgets} -body { .t index sel.first } -cleanup { destroy .t -} -returnCodes {error} -result {text doesn't contain any characters tagged with "sel"} +} -returnCodes {error} -result {text does not contain any characters tagged with "sel"} test text-32.1 {line heights on creation} -setup { diff --git a/tests/textIndex.test b/tests/textIndex.test index 17eb3f4..e2a2c92 100644 --- a/tests/textIndex.test +++ b/tests/textIndex.test @@ -257,7 +257,7 @@ test textIndex-4.5 {TkTextGetIndex, tags} { } {1 {bad text index "foo.last"}} test textIndex-4.6 {TkTextGetIndex, tags} { list [catch {.t index y.first} msg] $msg -} {1 {text doesn't contain any characters tagged with "y"}} +} {1 {text does not contain any characters tagged with "y"}} test textIndex-4.7 {TkTextGetIndex, tags} { list [catch {.t index x.last,} msg] $msg } {1 {bad text index "x.last,"}} @@ -1022,7 +1022,7 @@ test textIndex-26.2 {GetIndex errors out if mark, image, window, or tag is outsi destroy .t2 .p2 set res } {1.0 {bad text index "mymark"} 1.0 {bad text index "redsquare"} 1.2\ - {bad text index ".f"} 1.3 {text doesn't contain any characters tagged with "mytag"}} + {bad text index ".f"} 1.3 {text does not contain any characters tagged with "mytag"}} # cleanup rename textimage {} diff --git a/tests/textWind.test b/tests/textWind.test index ecb433e..bbc1b1c 100644 --- a/tests/textWind.test +++ b/tests/textWind.test @@ -446,7 +446,7 @@ test textWind-3.7 {EmbWinConfigure procedure} -setup { .t window create 1.3 -window .f.f } -cleanup { destroy .f -} -returnCodes error -result {can't embed .f.f in .t} +} -returnCodes error -result {cannot embed .f.f in .t} test textWind-3.8 {EmbWinConfigure procedure} -setup { destroy .t2 @@ -457,7 +457,7 @@ test textWind-3.8 {EmbWinConfigure procedure} -setup { .t window configure 1.3 -window .t2 } -cleanup { destroy .t2 -} -returnCodes error -result {can't embed .t2 in .t} +} -returnCodes error -result {cannot embed .t2 in .t} test textWind-3.9 {EmbWinConfigure procedure} -setup { destroy .t2 @@ -477,7 +477,7 @@ test textWind-3.10 {EmbWinConfigure procedure} -setup { .t insert 1.0 "Some sample text" .t window create 1.3 .t window configure 1.3 -window .t -} -returnCodes error -result {can't embed .t in .t} +} -returnCodes error -result {cannot embed .t in .t} test textWind-3.11 {EmbWinConfigure procedure} -setup { .t delete 1.0 end @@ -769,7 +769,7 @@ test textWind-10.4 {EmbWinLayoutProc procedure, error in creating window} -setup destroy .t.f rename bgerror {} } -result [list \ - {{can't embed .t.f.f relative to .t}} {{window name "f" already exists in parent}} \ + {{cannot embed .t.f.f relative to .t}} {{window name "f" already exists in parent}} \ [list [xchar 5] [expr {[yline 1]+$fixedHeight/2}] 0 0] \ 1] @@ -794,7 +794,7 @@ test textWind-10.5 {EmbWinLayoutProc procedure, error in creating window} -setup } -cleanup { destroy .t.f rename bgerror {} -} -result {{{can't embed .t.f.f relative to .t}} 1} +} -result {{{cannot embed .t.f.f relative to .t}} 1} test textWind-10.6 {EmbWinLayoutProc procedure, error in creating window} -setup { .t delete 1.0 end @@ -816,7 +816,7 @@ test textWind-10.6 {EmbWinLayoutProc procedure, error in creating window} -setup } -cleanup { rename bgerror {} } -result [list \ - {{can't embed .t relative to .t}} \ + {{cannot embed .t relative to .t}} \ [list [xchar 5] [expr {[yline 1]+$fixedHeight/2}] 0 0]] test textWind-10.7 {EmbWinLayoutProc procedure, error in creating window} -setup { @@ -839,7 +839,7 @@ test textWind-10.7 {EmbWinLayoutProc procedure, error in creating window} -setup } -cleanup { rename bgerror {} } -result [list \ - {{can't embed .t2 relative to .t}} {{window name "t2" already exists in parent}} \ + {{cannot embed .t2 relative to .t}} {{window name "t2" already exists in parent}} \ [list [xchar 5] [expr {[yline 1]+$fixedHeight/2}] 0 0]] test textWind-10.8 {EmbWinLayoutProc procedure, error in creating window} -setup { @@ -864,7 +864,7 @@ test textWind-10.8 {EmbWinLayoutProc procedure, error in creating window} -setup } -cleanup { destroy .t2 rename bgerror {} -} -result {{{can't embed .t2 relative to .t}} {{window name "t2" already exists in parent}}} +} -result {{{cannot embed .t2 relative to .t}} {{window name "t2" already exists in parent}}} test textWind-10.9 {EmbWinLayoutProc procedure, steal window from self} -setup { .t delete 1.0 end diff --git a/tests/tk.test b/tests/tk.test index 0316a7b..db09453 100644 --- a/tests/tk.test +++ b/tests/tk.test @@ -110,7 +110,7 @@ test tk-4.6 {tk command: useinputmethods: set new} -body { # given, because we may be on a Unix system that doesn't have the XIM # stuff if {[tk useinputmethods 1] == 0} { - puts "this wish doesn't have XIM (X Input Methods) support" + puts "this wish does not have XIM (X Input Methods) support" } return $useim } -result $useim diff --git a/tests/ttk/entry.test b/tests/ttk/entry.test index 0187720..3149d97 100644 --- a/tests/ttk/entry.test +++ b/tests/ttk/entry.test @@ -178,7 +178,7 @@ test entry-4.1 "Selection test" -body { test entry-4.2 "Disable -exportselection" -body { .e configure -exportselection false selection get -} -returnCodes error -result "PRIMARY selection doesn't exist*" -match glob +} -returnCodes error -result "PRIMARY selection does not exist*" -match glob test entry-4.3 "Reenable -exportselection" -body { .e configure -exportselection true @@ -302,7 +302,7 @@ test entry-8.2 "Unset linked variable by deleting namespace" -body { namespace delete ::test .e insert end "baz" ;# <== error here list [.e cget -textvariable] [.e get] [set foo] -} -returnCodes error -result "*parent namespace doesn't exist*" -match glob +} -returnCodes error -result "*parent namespace does*t exist*" -match glob # '-result [list ::test::foo "baz" "baz"]' would also be sensible, # but Tcl namespaces don't work that way. diff --git a/tests/ttk/image.test b/tests/ttk/image.test index 51f0f00..8d58a12 100644 --- a/tests/ttk/image.test +++ b/tests/ttk/image.test @@ -5,7 +5,7 @@ loadTestedCommands test image-1.1 "Bad image element" -body { ttk::style element create BadImage image badimage -} -returnCodes error -result {image "badimage" doesn't exist} +} -returnCodes error -result {image "badimage" does not exist} test image-1.2 "Duplicate element" -setup { image create photo test.element -width 10 -height 10 diff --git a/tests/ttk/labelframe.test b/tests/ttk/labelframe.test index f7cb8ef..012eba2 100644 --- a/tests/ttk/labelframe.test +++ b/tests/ttk/labelframe.test @@ -11,13 +11,13 @@ test labelframe-2.1 "Can't use indirect descendant as labelwidget" -body { ttk::frame .lf.t ttk::checkbutton .lf.t.cb .lf configure -labelwidget .lf.t.cb -} -returnCodes error -result "can't *" -match glob \ +} -returnCodes error -result "cannot *" -match glob \ -cleanup { destroy .lf.t } ; test labelframe-2.2 "Can't use toplevel as labelwidget" -body { toplevel .lf.t .lf configure -labelwidget .lf.t -} -returnCodes error -result "can't *" -match glob \ +} -returnCodes error -result "cannot *" -match glob \ -cleanup { destroy .lf.t } ; test labelframe-2.3 "Can't use non-windows as -labelwidget" -body { diff --git a/tests/ttk/notebook.test b/tests/ttk/notebook.test index f4558bf..0409856 100644 --- a/tests/ttk/notebook.test +++ b/tests/ttk/notebook.test @@ -25,7 +25,7 @@ test notebook-1.3 "Cannot add toplevel" -body { .nb add [toplevel .nb.t] } -cleanup { destroy .t.nb -} -returnCodes error -match glob -result "can't add .nb.t*" +} -returnCodes error -match glob -result "cannot add .nb.t*" test notebook-1.4 "Try to select bad tab" -body { .nb select @6000,6000 diff --git a/tests/ttk/ttk.test b/tests/ttk/ttk.test index d099c40..3462bf5 100644 --- a/tests/ttk/ttk.test +++ b/tests/ttk/ttk.test @@ -251,7 +251,7 @@ test ttk-3.2 "Propagate errors from variable traces" -body { .cb invoke } -cleanup { unset ::A ; destroy .cb -} -returnCodes error -result {can't set "A": failure} +} -returnCodes error -match glob -result {can*t set "A": failure} test ttk-3.3 "Constructor failure with cursor" -body { ttk::button .b -cursor bottom_right_corner -style BadStyle @@ -391,12 +391,12 @@ test ttk-8.4 "ImageChanged" -body { test ttk-9.1 "Traces on nonexistant namespaces" -body { ttk::checkbutton .tcb -variable foo::bar -} -returnCodes error -result "*parent namespace doesn't exist*" -match glob +} -returnCodes error -result "*parent namespace does*t exist*" -match glob test ttk-9.2 "Traces on nonexistant namespaces II" -body { ttk::checkbutton .tcb -variable X .tcb configure -variable foo::bar -} -returnCodes error -result "*parent namespace doesn't exist*" -match glob +} -returnCodes error -result "*parent namespace does*t exist*" -match glob test ttk-9.3 "Restore saved options on configure error" -body { .tcb cget -variable @@ -585,17 +585,17 @@ test ttk-13.5 "Custom layouts -- missing element definition" -body { test ttk-14.1 "-variable in nonexistant namespace" -body { ttk::checkbutton .tw -variable ::nsn::foo -} -returnCodes error -result {can't trace *: parent namespace doesn't exist} \ +} -returnCodes error -result {can*t trace *: parent namespace does*t exist} \ -match glob -cleanup { destroy .tw } test ttk-14.2 "-textvariable in nonexistant namespace" -body { ttk::label .tw -textvariable ::nsn::foo -} -returnCodes error -result {can't trace *: parent namespace doesn't exist} \ +} -returnCodes error -result {can*t trace *: parent namespace does*t exist} \ -match glob -cleanup { destroy .tw } test ttk-14.3 "-textvariable in nonexistant namespace" -body { ttk::entry .tw -textvariable ::nsn::foo -} -returnCodes error -result {can't trace *: parent namespace doesn't exist} \ +} -returnCodes error -result {can*t trace *: parent namespace does*t exist} \ -match glob -cleanup { destroy .tw } test ttk-15.1 {Bug 3062331} -setup { @@ -669,7 +669,7 @@ test ttk-ensemble-5 "style element create: valid" -body { test ttk-16.1 {ttk::style theme styles - no such theme} -body { ttk::style theme styles noSuchTheme -} -returnCodes 1 -result {theme "noSuchTheme" doesn't exist} +} -returnCodes 1 -result {theme "noSuchTheme" does not exist} test ttk-16.2 {ttk::style theme styles - theme exists} -body { # simply check this produces a list with some style names, # without checking exact content (not needed, and may vary diff --git a/tests/unixFont.test b/tests/unixFont.test index efc2fe9..9e0753b 100644 --- a/tests/unixFont.test +++ b/tests/unixFont.test @@ -71,7 +71,7 @@ proc getsize {} { test unixfont-1.1 {TkpGetNativeFont procedure: not native} {x11 noExceed} { list [catch {font measure {} xyz} msg] $msg -} {1 {font "" doesn't exist}} +} {1 {font "" does not exist}} test unixfont-1.2 {TkpGetNativeFont procedure: native} {x11 failsOnUbuntu} { font measure fixed 0 } 6 diff --git a/tests/unixWm.test b/tests/unixWm.test index 9194796..148bb7e 100644 --- a/tests/unixWm.test +++ b/tests/unixWm.test @@ -279,7 +279,7 @@ test unixWm-8.1 {icon windows} unix { toplevel .icon -width 50 -height 50 -bg red wm iconwindow .t .icon list [catch {wm withdraw .icon} msg] $msg -} {1 {can't withdraw .icon: it is an icon for .t}} +} {1 {cannot withdraw .icon: it is an icon for .t}} test unixWm-8.2 {icon windows} unix { destroy .t toplevel .t -width 100 -height 30 @@ -318,7 +318,7 @@ test unixWm-8.6 {icon windows} unix { toplevel .t -width 100 -height 30 frame .t.icon -width 50 -height 50 -bg red list [catch {wm iconwindow .t .t.icon} msg] $msg -} {1 {can't use .t.icon as icon window: not at top level}} +} {1 {cannot use .t.icon as icon window: not at top level}} test unixWm-8.7 {icon windows} unix { destroy .t destroy .icon @@ -505,16 +505,16 @@ test unixWm-12.7 {Tk_WmCmd procedure, "aspect" option} unix { } {1 {expected integer but got "baz"}} test unixWm-12.8 {Tk_WmCmd procedure, "aspect" option} unix { list [catch {wm aspect .t 0 14 15 16} msg] $msg -} {1 {aspect number can't be <= 0}} +} {1 {aspect number cannot be <= 0}} test unixWm-12.9 {Tk_WmCmd procedure, "aspect" option} unix { list [catch {wm aspect .t 13 0 15 16} msg] $msg -} {1 {aspect number can't be <= 0}} +} {1 {aspect number cannot be <= 0}} test unixWm-12.10 {Tk_WmCmd procedure, "aspect" option} unix { list [catch {wm aspect .t 13 14 0 16} msg] $msg -} {1 {aspect number can't be <= 0}} +} {1 {aspect number cannot be <= 0}} test unixWm-12.11 {Tk_WmCmd procedure, "aspect" option} unix { list [catch {wm aspect .t 13 14 15 0} msg] $msg -} {1 {aspect number can't be <= 0}} +} {1 {aspect number cannot be <= 0}} test unixWm-13.1 {Tk_WmCmd procedure, "client" option} unix { list [catch {wm client .t x y} msg] $msg @@ -634,7 +634,7 @@ test unixWm-16.2 {Tk_WmCmd procedure, "deiconify" option} unix { set result [list [catch {wm deiconify .icon} msg] $msg] destroy .icon set result -} {1 {can't deiconify .icon: it is an icon for .t}} +} {1 {cannot deiconify .icon: it is an icon for .t}} test unixWm-16.3 {Tk_WmCmd procedure, "deiconify" option} {unix failsOnUbuntu failsOnXQuarz} { wm iconify .t set result {} @@ -732,25 +732,25 @@ test unixWm-20.4 {Tk_WmCmd procedure, "grid" option} unix { } {1 {expected integer but got "bad"}} test unixWm-20.5 {Tk_WmCmd procedure, "grid" option} unix { list [catch {wm grid .t -1 11 12 13} msg] $msg -} {1 {baseWidth can't be < 0}} +} {1 {baseWidth cannot be < 0}} test unixWm-20.6 {Tk_WmCmd procedure, "grid" option} unix { list [catch {wm grid .t 10 foo 12 13} msg] $msg } {1 {expected integer but got "foo"}} test unixWm-20.7 {Tk_WmCmd procedure, "grid" option} unix { list [catch {wm grid .t 10 -11 12 13} msg] $msg -} {1 {baseHeight can't be < 0}} +} {1 {baseHeight cannot be < 0}} test unixWm-20.8 {Tk_WmCmd procedure, "grid" option} unix { list [catch {wm grid .t 10 11 bar 13} msg] $msg } {1 {expected integer but got "bar"}} test unixWm-20.9 {Tk_WmCmd procedure, "grid" option} unix { list [catch {wm grid .t 10 11 -2 13} msg] $msg -} {1 {widthInc can't be <= 0}} +} {1 {widthInc cannot be <= 0}} test unixWm-20.10 {Tk_WmCmd procedure, "grid" option} unix { list [catch {wm grid .t 10 11 12 bogus} msg] $msg } {1 {expected integer but got "bogus"}} test unixWm-20.11 {Tk_WmCmd procedure, "grid" option} unix { list [catch {wm grid .t 10 11 12 -1} msg] $msg -} {1 {heightInc can't be <= 0}} +} {1 {heightInc cannot be <= 0}} destroy .t destroy .icon @@ -835,7 +835,7 @@ test unixWm-23.2 {Tk_WmCmd procedure, "iconify" option} unix { set result [list [catch {wm iconify .t2} msg] $msg] destroy .t2 set result -} {1 {can't iconify ".t2": override-redirect flag is set}} +} {1 {cannot iconify ".t2": override-redirect flag is set}} test unixWm-23.3 {Tk_WmCmd procedure, "iconify" option} unix { destroy .t2 toplevel .t2 @@ -844,7 +844,7 @@ test unixWm-23.3 {Tk_WmCmd procedure, "iconify" option} unix { set result [list [catch {wm iconify .t2} msg] $msg] destroy .t2 set result -} {1 {can't iconify ".t2": it is a transient}} +} {1 {cannot iconify ".t2": it is a transient}} test unixWm-23.4 {Tk_WmCmd procedure, "iconify" option} unix { destroy .t2 toplevel .t2 @@ -853,7 +853,7 @@ test unixWm-23.4 {Tk_WmCmd procedure, "iconify" option} unix { set result [list [catch {wm iconify .t2} msg] $msg] destroy .t2 set result -} {1 {can't iconify ".t2": it is an icon for ".t"}} +} {1 {cannot iconify ".t2": it is an icon for ".t"}} test unixWm-23.5 {Tk_WmCmd procedure, "iconify" option} {unix failsOnUbuntu failsOnXQuarz} { destroy .t2 toplevel .t2 @@ -966,7 +966,7 @@ test unixWm-27.4 {Tk_WmCmd procedure, "iconwindow" option} unix { set result [list [catch {wm iconwindow .t .b} msg] $msg] destroy .b set result -} {1 {can't use .b as icon window: not at top level}} +} {1 {cannot use .b as icon window: not at top level}} test unixWm-27.5 {Tk_WmCmd procedure, "iconwindow" option} unix { destroy .icon toplevel .icon -width 50 -height 50 -bg green @@ -1337,7 +1337,7 @@ test unixWm-38.2 {Tk_WmCmd procedure, "withdraw" option} unix { set result [list [catch {wm withdraw .t2} msg] $msg] destroy .t2 set result -} {1 {can't withdraw .t2: it is an icon for .t}} +} {1 {cannot withdraw .t2: it is an icon for .t}} test unixWm-38.3 {Tk_WmCmd procedure, "withdraw" option} unix { set result {} wm withdraw .t diff --git a/tests/visual.test b/tests/visual.test index da6c41a..6e3a112 100644 --- a/tests/visual.test +++ b/tests/visual.test @@ -520,7 +520,7 @@ test visual-7.6 {Tk_GetColormap, copy from other window} -constraints { toplevel .t2 -width 400 -height 50 -colormap .t1 } -cleanup { deleteWindows -} -returnCodes error -result {can't use colormap for .t1: incompatible visuals} +} -returnCodes error -result {cannot use colormap for .t1: incompatible visuals} test visual-8.1 {Tk_FreeColormap procedure} -setup { diff --git a/tests/winClipboard.test b/tests/winClipboard.test index 28e508b..940b0d9 100644 --- a/tests/winClipboard.test +++ b/tests/winClipboard.test @@ -26,7 +26,7 @@ test winClipboard-1.1 {TkSelGetSelection} -constraints win -setup { selection get -selection CLIPBOARD } -cleanup { clipboard clear -} -returnCodes error -result {CLIPBOARD selection doesn't exist or form "STRING" not defined} +} -returnCodes error -result {CLIPBOARD selection does not exist or form "STRING" not defined} test winClipboard-1.2 {TkSelGetSelection} -constraints { win testclipboard diff --git a/tests/winDialog.test b/tests/winDialog.test index 5fddf19..cd55666 100755 --- a/tests/winDialog.test +++ b/tests/winDialog.test @@ -423,7 +423,7 @@ test winDialog-5.7.8 {tk_getOpenFile: -defaultextension} -constraints { return $x } -result [file join [initialdir] "5 7 8.aaa"] -test winDialog-5.8 {GetFileName: extension doesn't begin with .} -constraints { +test winDialog-5.8 {GetFileName: extension does not begin with .} -constraints { nt testwinevent } -body { start {set x [tk_getSaveFile -defaultextension foo -title Save]} @@ -486,7 +486,7 @@ test winDialog-5.12 {GetFileName: initial directory: Tcl_TranslateFilename()} -c nt tcl8 } -body { tk_getOpenFile -initialdir ~12x/455 -} -returnCodes error -result {user "12x" doesn't exist} +} -returnCodes error -result {user "12x" does not exist} test winDialog-5.12.1 {tk_getSaveFile: initial directory: ~} -constraints { nt testwinevent tcl8 @@ -711,7 +711,7 @@ test winDialog-5.14 {GetFileName: initial file: Tcl_TranslateFileName()} -constr } -body { # if (Tcl_TranslateFileName(interp, string, &ds) == NULL) tk_getOpenFile -initialfile ~12x/455 -} -returnCodes error -result {user "12x" doesn't exist} +} -returnCodes error -result {user "12x" does not exist} if {![vista?]} { # XXX - disabled for Vista because the new dialogs allow long file # names to be specified but force the user to change it. @@ -944,7 +944,7 @@ test winDialog-9.8 {Tk_ChooseDirectoryObjCmd: initial directory: Tcl_TranslateFi # &utfDirString) == NULL) tk_chooseDirectory -initialdir ~12x/455 -} -returnCodes error -result {user "12x" doesn't exist} +} -returnCodes error -result {user "12x" does not exist} test winDialog-10.1 {Tk_FontchooserObjCmd: no arguments} -constraints { diff --git a/tests/winFont.test b/tests/winFont.test index 03096f6..0f80e8c 100644 --- a/tests/winFont.test +++ b/tests/winFont.test @@ -21,7 +21,7 @@ test winfont-1.1 {TkpGetNativeFont procedure: not native} -constraints { } -body { catch {font delete xyz} font measure {} xyz -} -returnCodes error -result {font "" doesn't exist} +} -returnCodes error -result {font "" does not exist} test winfont-1.2 {TkpGetNativeFont procedure: native} -constraints win -body { font measure ansifixed 0 font measure ansi 0 diff --git a/tests/winWm.test b/tests/winWm.test index 35775a2..0536f2a 100644 --- a/tests/winWm.test +++ b/tests/winWm.test @@ -41,7 +41,7 @@ test winWm-1.2 {TkWmMapWindow} -constraints win -setup { wm iconify .t } -cleanup { destroy .t -} -returnCodes error -result {can't iconify ".t": it is a transient} +} -returnCodes error -result {cannot iconify ".t": it is a transient} test winWm-1.3 {TkWmMapWindow} -constraints win -setup { destroy .t } -body { diff --git a/tests/window.test b/tests/window.test index 892ceea..de6ad39 100644 --- a/tests/window.test +++ b/tests/window.test @@ -36,7 +36,7 @@ test window-1.1 {Tk_CreateWindowFromPath procedure, parent dead} -setup { set x } -cleanup { rename bgerror {} -} -result {{can't create window: parent has been destroyed} {can't create window: parent has been destroyed +} -result {{cannot create window: parent has been destroyed} {cannot create window: parent has been destroyed while executing "button .t.b -text hello" (command bound to event)}} @@ -291,9 +291,9 @@ test window-2.12 {Test for ticket [9b6065d1fd] - restore Tcl [update] command} - removeFile script list $error $msg } -result {0 {waiting -ringing the bell -> can't invoke "bell" command: application has been destroyed +ringing the bell -> cannot invoke "bell" command: application has been destroyed done waiting -bell -> can't invoke "bell" command: application has been destroyed +bell -> cannot invoke "bell" command: application has been destroyed update -> }} diff --git a/tests/winfo.test b/tests/winfo.test index 908647b..b165686 100644 --- a/tests/winfo.test +++ b/tests/winfo.test @@ -239,7 +239,7 @@ test winfo-7.5 {"winfo pathname" command} -body { } -returnCodes error -result {expected integer but got "xyz"} test winfo-7.6 {"winfo pathname" command} -body { winfo pathname 224 -} -returnCodes error -result {window id "224" doesn't exist in this application} +} -returnCodes error -result {window id "224" does not exist in this application} test winfo-7.7 {"winfo pathname" command} -setup { destroy .b button .b -text "Help" diff --git a/tests/wm.test b/tests/wm.test index 650292d..33008d1 100644 --- a/tests/wm.test +++ b/tests/wm.test @@ -166,16 +166,16 @@ test wm-aspect-1.8 {usage} -returnCodes error -body { } -result {expected integer but got "baz"} test wm-aspect-1.9 {usage} -returnCodes error -body { wm aspect . 0 14 15 16 -} -result {aspect number can't be <= 0} +} -result {aspect number cannot be <= 0} test wm-aspect-1.10 {usage} -returnCodes error -body { wm aspect . 13 0 15 16 -} -result {aspect number can't be <= 0} +} -result {aspect number cannot be <= 0} test wm-aspect-1.11 {usage} -returnCodes error -body { wm aspect . 13 14 0 16 -} -result {aspect number can't be <= 0} +} -result {aspect number cannot be <= 0} test wm-aspect-1.12 {usage} -returnCodes error -body { wm aspect . 13 14 15 0 -} -result {aspect number can't be <= 0} +} -result {aspect number cannot be <= 0} test wm-aspect-2.1 {setting and reading values} -setup { set result {} @@ -318,7 +318,7 @@ test wm-attributes-1.3.8 {override-redirect not compatible with fullscreen attri wm attributes .t -fullscreen 1 } -returnCodes error -cleanup { deleteWindows -} -result {can't set fullscreen attribute for ".t": override-redirect flag is set} +} -result {cannot set fullscreen attribute for ".t": override-redirect flag is set} test wm-attributes-1.3.9 {max height too small} -constraints win -body { toplevel .t update @@ -326,7 +326,7 @@ test wm-attributes-1.3.9 {max height too small} -constraints win -body { wm attributes .t -fullscreen 1 } -returnCodes error -cleanup { deleteWindows -} -result {can't set fullscreen attribute for ".t": max width/height is too small} +} -result {cannot set fullscreen attribute for ".t": max width/height is too small} test wm-attributes-1.3.10 {max height too small} -constraints win -body { toplevel .t update @@ -334,7 +334,7 @@ test wm-attributes-1.3.10 {max height too small} -constraints win -body { wm attributes .t -fullscreen 1 } -returnCodes error -cleanup { deleteWindows -} -result {can't set fullscreen attribute for ".t": max width/height is too small} +} -result {cannot set fullscreen attribute for ".t": max width/height is too small} test wm-attributes-1.3.11 {another attribute, then -fullscreen} -constraints win -body { toplevel .t update @@ -596,7 +596,7 @@ test wm-deiconify-1.4 {usage} -setup { wm deiconify .icon } -returnCodes error -cleanup { destroy .icon -} -result {can't deiconify .icon: it is an icon for .t} +} -result {cannot deiconify .icon: it is an icon for .t} # test embedded window for Windows test wm-deiconify-1.5 {usage} -constraints win -setup { destroy .embed @@ -606,7 +606,7 @@ test wm-deiconify-1.5 {usage} -constraints win -setup { wm deiconify .embed } -returnCodes error -cleanup { destroy .t.f .embed -} -result {can't deiconify .embed: the container does not support the request} +} -result {cannot deiconify .embed: the container does not support the request} # test embedded window for other platforms test wm-deiconify-1.6 {usage} -constraints !win -setup { destroy .embed @@ -616,7 +616,7 @@ test wm-deiconify-1.6 {usage} -constraints !win -setup { wm deiconify .embed } -returnCodes error -cleanup { destroy .t.f .embed -} -result {can't deiconify .embed: it is an embedded window} +} -result {cannot deiconify .embed: it is an embedded window} deleteWindows test wm-deiconify-2.1 {a window that has never been mapped\ @@ -748,16 +748,16 @@ test wm-grid-1.8 {usage} -returnCodes error -body { } -result {expected integer but got "baz"} test wm-grid-1.9 {usage} -returnCodes error -body { wm grid . -1 14 15 16 -} -result {baseWidth can't be < 0} +} -result {baseWidth cannot be < 0} test wm-grid-1.10 {usage} -returnCodes error -body { wm grid . 13 -1 15 16 -} -result {baseHeight can't be < 0} +} -result {baseHeight cannot be < 0} test wm-grid-1.11 {usage} -returnCodes error -body { wm grid . 13 14 -1 16 -} -result {widthInc can't be <= 0} +} -result {widthInc cannot be <= 0} test wm-grid-1.12 {usage} -returnCodes error -body { wm grid . 13 14 15 -1 -} -result {heightInc can't be <= 0} +} -result {heightInc cannot be <= 0} test wm-grid-2.1 {setting and reading values} -setup { set result {} @@ -818,7 +818,7 @@ test wm-iconbadge-1.4 {::tk::icons::base_icon($win) must be a Tk photo on X11} - } -body { set ::tk::icons::base_icon(.) book wm iconbadge . 27 -} -returnCodes error -result {can't use "book" as iconphoto: not a photo image} +} -returnCodes error -result {cannot use "book" as iconphoto: not a photo image} test wm-iconbadge-1.5 {illegal badge number} -body { image create photo book -data { R0lGODlhDwAPAKIAAP//////AP8AAMDAwICAgAAAAAAAAAAAAC @@ -830,7 +830,7 @@ test wm-iconbadge-1.5 {illegal badge number} -body { wm iconbadge . illegal } -cleanup { image delete book -} -returnCodes error -result {can't use "illegal" as icon badge} +} -returnCodes error -result {cannot use "illegal" as icon badge} test wm-iconbadge-1.6 {non-integer badge number} -body { image create photo book -data { R0lGODlhDwAPAKIAAP//////AP8AAMDAwICAgAAAAAAAAAAAAC @@ -842,7 +842,7 @@ test wm-iconbadge-1.6 {non-integer badge number} -body { wm iconbadge . 3.2 } -cleanup { image delete book -} -returnCodes error -result {can't use "3.2" as icon badge} +} -returnCodes error -result {cannot use "3.2" as icon badge} test wm-iconbadge-1.7 {negative or zero badge number} -body { image create photo book -data { R0lGODlhDwAPAKIAAP//////AP8AAMDAwICAgAAAAAAAAAAAAC @@ -854,7 +854,7 @@ test wm-iconbadge-1.7 {negative or zero badge number} -body { wm iconbadge . 0 } -cleanup { image delete book -} -returnCodes error -result {can't use "0" as icon badge} +} -returnCodes error -result {cannot use "0" as icon badge} test wm-iconbadge-1.8 {usage, no need to call iconphoto on aqua or win32} -constraints { aquaOrWin32 } -body { @@ -908,7 +908,7 @@ test wm-iconify-2.1 {Misc errors} -body { wm iconify .t2 } -returnCodes error -cleanup { destroy .t2 -} -result {can't iconify ".t2": override-redirect flag is set} +} -result {cannot iconify ".t2": override-redirect flag is set} test wm-iconify-2.2 {Misc errors} -body { toplevel .t2 wm geom .t2 +0+0 @@ -916,7 +916,7 @@ test wm-iconify-2.2 {Misc errors} -body { wm iconify .t2 } -returnCodes error -cleanup { destroy .t2 -} -result {can't iconify ".t2": it is a transient} +} -result {cannot iconify ".t2": it is a transient} test wm-iconify-2.3 {Misc errors} -body { toplevel .t2 wm geom .t2 +0+0 @@ -924,7 +924,7 @@ test wm-iconify-2.3 {Misc errors} -body { wm iconify .t2 } -returnCodes error -cleanup { destroy .t2 -} -result {can't iconify ".t2": it is an icon for ".t"} +} -result {cannot iconify ".t2": it is an icon for ".t"} # test embedded window for Windows test wm-iconify-2.4.1 {Misc errors} -constraints win -setup { destroy .t2 @@ -934,7 +934,7 @@ test wm-iconify-2.4.1 {Misc errors} -constraints win -setup { wm iconify .t2 } -returnCodes error -cleanup { destroy .t2 .r.f -} -result {can't iconify ".t2": the container does not support the request} +} -result {cannot iconify ".t2": the container does not support the request} # test embedded window for other platforms test wm-iconify-2.4.2 {Misc errors} -constraints !win -setup { destroy .t2 @@ -944,7 +944,7 @@ test wm-iconify-2.4.2 {Misc errors} -constraints !win -setup { wm iconify .t2 } -returnCodes error -cleanup { destroy .t2 .r.f -} -result {can't iconify ".t2": it is an embedded window} +} -result {cannot iconify ".t2": it is an embedded window} test wm-iconify-3.1 {iconify behavior} -constraints {failsOnUbuntu failsOnXQuarz} -body { toplevel .t2 @@ -1009,7 +1009,7 @@ test wm-iconphoto-1.2 {usage} -returnCodes error -body { } -result {wrong # args: should be "wm iconphoto window ?-default? image1 ?image2 ...?"} test wm-iconphoto-1.3 {usage} -returnCodes error -body { wm iconphoto . notanimage -} -result {can't use "notanimage" as iconphoto: not a photo image} +} -result {cannot use "notanimage" as iconphoto: not a photo image} test wm-iconphoto-1.4 {usage} -returnCodes error -body { # we currently have no return info wm iconphoto . -default @@ -1070,7 +1070,7 @@ test wm-iconwindow-1.4 {usage} -setup { wm iconwindow .t .b } -returnCodes error -cleanup { destroy .b -} -result {can't use .b as icon window: not at top level} +} -result {cannot use .b as icon window: not at top level} test wm-iconwindow-1.5 {usage} -setup { destroy .icon .t2 } -body { @@ -1677,7 +1677,7 @@ test wm-stackorder-5.1 {a menu is not a toplevel} -body { } -cleanup { destroy .t } -result {.t .} -test wm-stackorder-5.2 {A normal toplevel can't be raised above an \ +test wm-stackorder-5.2 {A normal toplevel cannot be raised above an \ overrideredirect toplevel on unix} -constraints {x11 failsOnUbuntu failsOnXQuarz} -body { toplevel .t wm overrideredirect .t 1 @@ -1768,7 +1768,7 @@ test wm-transient-1.4 {usage} -returnCodes error -body { wm iconify .subject } -cleanup { deleteWindows -} -result {can't iconify ".subject": it is a transient} +} -result {cannot iconify ".subject": it is a transient} test wm-transient-1.5 {usage} -returnCodes error -body { toplevel .icon -bg blue toplevel .top @@ -1777,7 +1777,7 @@ test wm-transient-1.5 {usage} -returnCodes error -body { wm transient .icon .dummy } -cleanup { deleteWindows -} -result {can't make ".icon" a transient: it is an icon for .top} +} -result {cannot make ".icon" a transient: it is an icon for .top} test wm-transient-1.6 {usage} -returnCodes error -body { toplevel .icon -bg blue toplevel .top @@ -1786,13 +1786,13 @@ test wm-transient-1.6 {usage} -returnCodes error -body { wm transient .dummy .icon } -cleanup { deleteWindows -} -result {can't make ".icon" a container: it is an icon for .top} +} -result {cannot make ".icon" a container: it is an icon for .top} test wm-transient-1.7 {usage} -returnCodes error -body { toplevel .top wm transient .top .top } -cleanup { deleteWindows -} -result {can't set ".top" as container: would cause management loop} +} -result {cannot set ".top" as container: would cause management loop} test wm-transient-1.8 {usage} -returnCodes error -body { toplevel .t1 toplevel .t2 @@ -1802,14 +1802,14 @@ test wm-transient-1.8 {usage} -returnCodes error -body { wm transient .t1 .t3 } -cleanup { deleteWindows -} -result {can't set ".t3" as container: would cause management loop} +} -result {cannot set ".t3" as container: would cause management loop} test wm-transient-1.9 {usage} -returnCodes error -body { toplevel .top frame .top.f wm transient .top .top.f } -cleanup { deleteWindows -} -result {can't set ".top" as container: would cause management loop} +} -result {cannot set ".top" as container: would cause management loop} test wm-transient-2.1 {basic get/set of toplevel} -setup { set results [list] @@ -2267,7 +2267,7 @@ test wm-withdraw-2.1 {Misc errors} -body { wm withdraw .t2 } -returnCodes error -cleanup { deleteWindows -} -result {can't withdraw .t2: it is an icon for .t} +} -result {cannot withdraw .t2: it is an icon for .t} test wm-withdraw-3.1 {} -setup { set result {} diff --git a/unix/tkUnixCursor.c b/unix/tkUnixCursor.c index 55d1a08..80dfa86 100644 --- a/unix/tkUnixCursor.c +++ b/unix/tkUnixCursor.c @@ -311,7 +311,7 @@ TkGetCursorByName( if (!inTkTable && Tcl_IsSafe(interp)) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "can't get cursor from a file in a safe interpreter", + "cannot get cursor from a file in a safe interpreter", TCL_INDEX_NONE)); Tcl_SetErrorCode(interp, "TK", "SAFE", "CURSOR_FILE", NULL); cursorPtr = NULL; diff --git a/unix/tkUnixEmbed.c b/unix/tkUnixEmbed.c index 6215671..3a8fab8 100644 --- a/unix/tkUnixEmbed.c +++ b/unix/tkUnixEmbed.c @@ -111,7 +111,7 @@ Tk_UseWindow( if (winPtr->window != None) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "can't modify container after widget is created", TCL_INDEX_NONE)); + "cannot modify container after widget is created", TCL_INDEX_NONE)); Tcl_SetErrorCode(interp, "TK", "EMBED", "POST_CREATE", NULL); return TCL_ERROR; } @@ -122,7 +122,7 @@ Tk_UseWindow( usePtr = (TkWindow *) Tk_IdToWindow(winPtr->display, parent); if (usePtr != NULL && !(usePtr->flags & TK_CONTAINER)) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "window \"%s\" doesn't have -container option set", + "window \"%s\" does not have -container option set", usePtr->pathName)); Tcl_SetErrorCode(interp, "TK", "EMBED", "CONTAINER", NULL); return TCL_ERROR; diff --git a/unix/tkUnixSelect.c b/unix/tkUnixSelect.c index 13c2b30..f7a7a6c 100644 --- a/unix/tkUnixSelect.c +++ b/unix/tkUnixSelect.c @@ -560,7 +560,7 @@ TkSelEventProc( } if (eventPtr->xselection.property == None) { Tcl_SetObjResult(retrPtr->interp, Tcl_ObjPrintf( - "%s selection doesn't exist or form \"%s\" not defined", + "%s selection does not exist or form \"%s\" not defined", Tk_GetAtomName(tkwin, retrPtr->selection), Tk_GetAtomName(tkwin, retrPtr->target))); Tcl_SetErrorCode(retrPtr->interp, "TK", "SELECTION", diff --git a/unix/tkUnixWm.c b/unix/tkUnixWm.c index 51a308b..16100a0 100644 --- a/unix/tkUnixWm.c +++ b/unix/tkUnixWm.c @@ -1224,7 +1224,7 @@ WmAspectCmd( if ((numer1 <= 0) || (denom1 <= 0) || (numer2 <= 0) || (denom2 <= 0)) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "aspect number can't be <= 0", TCL_INDEX_NONE)); + "aspect number cannot be <= 0", TCL_INDEX_NONE)); Tcl_SetErrorCode(interp, "TK", "VALUE", "ASPECT", NULL); return TCL_ERROR; } @@ -1722,14 +1722,14 @@ WmDeiconifyCmd( } if (wmPtr->iconFor != NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't deiconify %s: it is an icon for %s", + "cannot deiconify %s: it is an icon for %s", Tcl_GetString(objv[2]), Tk_PathName(wmPtr->iconFor))); Tcl_SetErrorCode(interp, "TK", "WM", "DEICONIFY", "ICON", NULL); return TCL_ERROR; } if (winPtr->flags & TK_EMBEDDED) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't deiconify %s: it is an embedded window", + "cannot deiconify %s: it is an embedded window", winPtr->pathName)); Tcl_SetErrorCode(interp, "TK", "WM", "DEICONIFY", "EMBEDDED", NULL); return TCL_ERROR; @@ -2018,25 +2018,25 @@ WmGridCmd( } if (reqWidth < 0) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "baseWidth can't be < 0", TCL_INDEX_NONE)); + "baseWidth cannot be < 0", TCL_INDEX_NONE)); Tcl_SetErrorCode(interp, "TK", "VALUE", "GRID", NULL); return TCL_ERROR; } if (reqHeight < 0) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "baseHeight can't be < 0", TCL_INDEX_NONE)); + "baseHeight cannot be < 0", TCL_INDEX_NONE)); Tcl_SetErrorCode(interp, "TK", "VALUE", "GRID", NULL); return TCL_ERROR; } if (widthInc <= 0) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "widthInc can't be <= 0", TCL_INDEX_NONE)); + "widthInc cannot be <= 0", TCL_INDEX_NONE)); Tcl_SetErrorCode(interp, "TK", "VALUE", "GRID", NULL); return TCL_ERROR; } if (heightInc <= 0) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "heightInc can't be <= 0", TCL_INDEX_NONE)); + "heightInc cannot be <= 0", TCL_INDEX_NONE)); Tcl_SetErrorCode(interp, "TK", "VALUE", "GRID", NULL); return TCL_ERROR; } @@ -2258,7 +2258,7 @@ WmIconifyCmd( } if (Tk_Attributes((Tk_Window) winPtr)->override_redirect) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't iconify \"%s\": override-redirect flag is set", + "cannot iconify \"%s\": override-redirect flag is set", winPtr->pathName)); Tcl_SetErrorCode(interp, "TK", "WM", "ICONIFY", "OVERRIDE_REDIRECT", NULL); @@ -2266,21 +2266,21 @@ WmIconifyCmd( } if (wmPtr->containerPtr != NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't iconify \"%s\": it is a transient", + "cannot iconify \"%s\": it is a transient", winPtr->pathName)); Tcl_SetErrorCode(interp, "TK", "WM", "ICONIFY", "TRANSIENT", NULL); return TCL_ERROR; } if (wmPtr->iconFor != NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't iconify \"%s\": it is an icon for \"%s\"", + "cannot iconify \"%s\": it is an icon for \"%s\"", winPtr->pathName, Tk_PathName(wmPtr->iconFor))); Tcl_SetErrorCode(interp, "TK", "WM", "ICONIFY", "ICON", NULL); return TCL_ERROR; } if (winPtr->flags & TK_EMBEDDED) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't iconify \"%s\": it is an embedded window", + "cannot iconify \"%s\": it is an embedded window", winPtr->pathName)); Tcl_SetErrorCode(interp, "TK", "WM", "ICONIFY", "EMBEDDED", NULL); return TCL_ERROR; @@ -2459,7 +2459,7 @@ WmIconphotoCmd( photo = Tk_FindPhoto(interp, Tcl_GetString(objv[i])); if (photo == NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't use \"%s\" as iconphoto: not a photo image", + "cannot use \"%s\" as iconphoto: not a photo image", Tcl_GetString(objv[i]))); Tcl_SetErrorCode(interp, "TK", "WM", "ICONPHOTO", "PHOTO", NULL); return TCL_ERROR; @@ -2676,7 +2676,7 @@ WmIconwindowCmd( } if (!Tk_IsTopLevel(tkwin2)) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't use %s as icon window: not at top level", + "cannot use %s as icon window: not at top level", Tcl_GetString(objv[3]))); Tcl_SetErrorCode(interp, "TK", "WM", "ICONWINDOW", "INNER", NULL); return TCL_ERROR; @@ -3429,7 +3429,7 @@ WmStateCmd( if (objc == 4) { if (wmPtr->iconFor != NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't change state of %s: it is an icon for %s", + "cannot change state of %s: it is an icon for %s", Tcl_GetString(objv[2]), Tk_PathName(wmPtr->iconFor))); Tcl_SetErrorCode(interp, "TK", "WM", "STATE", "ICON", NULL); return TCL_ERROR; @@ -3446,7 +3446,7 @@ WmStateCmd( } else if (index == OPT_ICONIC) { if (Tk_Attributes((Tk_Window) winPtr)->override_redirect) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't iconify \"%s\": override-redirect flag is set", + "cannot iconify \"%s\": override-redirect flag is set", winPtr->pathName)); Tcl_SetErrorCode(interp, "TK", "WM", "STATE", "OVERRIDE_REDIRECT", NULL); @@ -3454,7 +3454,7 @@ WmStateCmd( } if (wmPtr->containerPtr != NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't iconify \"%s\": it is a transient", + "cannot iconify \"%s\": it is a transient", winPtr->pathName)); Tcl_SetErrorCode(interp, "TK", "WM", "STATE", "TRANSIENT", NULL); @@ -3625,7 +3625,7 @@ WmTransientCmd( if (wmPtr->iconFor != NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't make \"%s\" a transient: it is an icon for %s", + "cannot make \"%s\" a transient: it is an icon for %s", Tcl_GetString(objv[2]), Tk_PathName(wmPtr->iconFor))); Tcl_SetErrorCode(interp, "TK", "WM", "TRANSIENT", "ICON", NULL); return TCL_ERROR; @@ -3638,7 +3638,7 @@ WmTransientCmd( if (wmPtr2->iconFor != NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't make \"%s\" a container: it is an icon for %s", + "cannot make \"%s\" a container: it is an icon for %s", Tcl_GetString(objv[3]), Tk_PathName(wmPtr2->iconFor))); Tcl_SetErrorCode(interp, "TK", "WM", "TRANSIENT", "ICON", NULL); return TCL_ERROR; @@ -3648,7 +3648,7 @@ WmTransientCmd( w = (TkWindow *)w->wmInfoPtr->containerPtr) { if (w == winPtr) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't set \"%s\" as container: would cause management loop", + "cannot set \"%s\" as container: would cause management loop", Tk_PathName(containerPtr))); Tcl_SetErrorCode(interp, "TK", "WM", "TRANSIENT", "SELF", NULL); return TCL_ERROR; @@ -3731,7 +3731,7 @@ WmWithdrawCmd( } if (wmPtr->iconFor != NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't withdraw %s: it is an icon for %s", + "cannot withdraw %s: it is an icon for %s", Tcl_GetString(objv[2]), Tk_PathName(wmPtr->iconFor))); Tcl_SetErrorCode(interp, "TK", "WM", "WITHDRAW", "ICON", NULL); return TCL_ERROR; diff --git a/win/tkWinClipboard.c b/win/tkWinClipboard.c index f51bf8a..cf7c584 100644 --- a/win/tkWinClipboard.c +++ b/win/tkWinClipboard.c @@ -202,7 +202,7 @@ TkSelGetSelection( error: Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "%s selection doesn't exist or form \"%s\" not defined", + "%s selection does not exist or form \"%s\" not defined", Tk_GetAtomName(tkwin, selection), Tk_GetAtomName(tkwin, target))); Tcl_SetErrorCode(interp, "TK", "SELECTION", "EXISTS", NULL); return TCL_ERROR; diff --git a/win/tkWinCursor.c b/win/tkWinCursor.c index 635ae66..16dc73d 100644 --- a/win/tkWinCursor.c +++ b/win/tkWinCursor.c @@ -132,7 +132,7 @@ TkGetCursorByName( if (Tcl_IsSafe(interp)) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "can't get cursor from a file in a safe interpreter", TCL_INDEX_NONE)); + "cannot get cursor from a file in a safe interpreter", TCL_INDEX_NONE)); Tcl_SetErrorCode(interp, "TK", "SAFE", "CURSOR_FILE", NULL); ckfree(argv); ckfree(cursorPtr); diff --git a/win/tkWinEmbed.c b/win/tkWinEmbed.c index 34cd8ca..d1b2112 100644 --- a/win/tkWinEmbed.c +++ b/win/tkWinEmbed.c @@ -248,7 +248,7 @@ Tk_UseWindow( /* if (winPtr->window != None) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "can't modify container after widget is created", TCL_INDEX_NONE)); + "cannot modify container after widget is created", TCL_INDEX_NONE)); Tcl_SetErrorCode(interp, "TK", "EMBED", "POST_CREATE", NULL); return TCL_ERROR; } @@ -281,7 +281,7 @@ Tk_UseWindow( if (!IsWindow(hwnd)) { if (interp != NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "window \"%s\" doesn't exist", string)); + "window \"%s\" does not exist", string)); Tcl_SetErrorCode(interp, "TK", "EMBED", "EXIST", NULL); } return TCL_ERROR; diff --git a/win/tkWinGDI.c b/win/tkWinGDI.c index 2cded45..ab4705f 100644 --- a/win/tkWinGDI.c +++ b/win/tkWinGDI.c @@ -455,7 +455,7 @@ static int GdiPhoto( photo_handle = Tk_FindPhoto(interp, photoname); if (photo_handle == 0) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "::tk::print::_gdi photo: Photo name %s can't be located\n%s", + "::tk::print::_gdi photo: Photo name %s cannot be located\n%s", photoname, usage_message)); return TCL_ERROR; } diff --git a/win/tkWinMenu.c b/win/tkWinMenu.c index 909237c..6d14f75 100644 --- a/win/tkWinMenu.c +++ b/win/tkWinMenu.c @@ -1433,7 +1433,7 @@ TkWinHandleMenuEvent( TkActivateMenuEntry(menuPtr, TCL_INDEX_NONE); } else { if (mePtr->index >= (int)menuPtr->numEntries) { - Tcl_Panic("Trying to activate an entry which doesn't exist"); + Tcl_Panic("Trying to activate an entry which does not exist"); } TkActivateMenuEntry(menuPtr, mePtr->index); } diff --git a/win/tkWinSysTray.c b/win/tkWinSysTray.c index a710ee6..6c56735 100644 --- a/win/tkWinSysTray.c +++ b/win/tkWinSysTray.c @@ -375,7 +375,7 @@ GetIcoPtr( notfound: Tcl_AppendResult(interp, "icon \"", string, - "\" doesn't exist", NULL); + "\" does not exist", NULL); return NULL; } @@ -983,7 +983,7 @@ WinSystrayCmd( photo = Tk_FindPhoto(interp, Tcl_GetString(imageObj)); if (photo == NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "image \"%s\" doesn't exist", Tcl_GetString(imageObj))); + "image \"%s\" does not exist", Tcl_GetString(imageObj))); return TCL_ERROR; } Tk_PhotoGetSize(photo, &width, &height); diff --git a/win/tkWinWm.c b/win/tkWinWm.c index ba52b32..aeb77d8 100644 --- a/win/tkWinWm.c +++ b/win/tkWinWm.c @@ -1708,7 +1708,7 @@ TkWinWmCleanup( /* * If we're using stubs to access the Tcl library, and they haven't been - * initialized, we can't call Tcl_GetThreadData. + * initialized, we cannot call Tcl_GetThreadData. */ #ifdef USE_TCL_STUBS @@ -2901,7 +2901,7 @@ WmAspectCmd( } if ((numer1 <= 0) || (denom1 <= 0) || (numer2 <= 0) || (denom2 <= 0)) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "aspect number can't be <= 0", TCL_INDEX_NONE)); + "aspect number cannot be <= 0", TCL_INDEX_NONE)); Tcl_SetErrorCode(interp, "TK", "VALUE", "ASPECT", NULL); return TCL_ERROR; } @@ -3019,7 +3019,7 @@ WmAttributesCmd( styleBit = WS_EX_TOPMOST; if ((i < objc-1) && (winPtr->flags & TK_EMBEDDED)) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't set topmost flag on %s: it is an embedded window", + "cannot set topmost flag on %s: it is an embedded window", winPtr->pathName)); Tcl_SetErrorCode(interp, "TK", "WM", "ATTR", "TOPMOST", NULL); return TCL_ERROR; @@ -3183,7 +3183,7 @@ WmAttributesCmd( if (fullscreen_attr) { if (Tk_Attributes((Tk_Window) winPtr)->override_redirect) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't set fullscreen attribute for \"%s\":" + "cannot set fullscreen attribute for \"%s\":" " override-redirect flag is set", winPtr->pathName)); Tcl_SetErrorCode(interp, "TK", "WM", "ATTR", "OVERRIDE_REDIRECT", NULL); @@ -3201,7 +3201,7 @@ WmAttributesCmd( ((wmPtr->maxHeight > 0) && (HeightOfScreen(Tk_Screen(winPtr)) > wmPtr->maxHeight))) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't set fullscreen attribute for \"%s\":" + "cannot set fullscreen attribute for \"%s\":" " max width/height is too small", winPtr->pathName)); Tcl_SetErrorCode(interp, "TK", "WM", "ATTR", "SMALL_MAX", NULL); return TCL_ERROR; @@ -3481,7 +3481,7 @@ WmDeiconifyCmd( } if (wmPtr->iconFor != NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't deiconify %s: it is an icon for %s", + "cannot deiconify %s: it is an icon for %s", Tcl_GetString(objv[2]), Tk_PathName(wmPtr->iconFor))); Tcl_SetErrorCode(interp, "TK", "WM", "DEICONIFY", "ICON", NULL); return TCL_ERROR; @@ -3489,7 +3489,7 @@ WmDeiconifyCmd( if (winPtr->flags & TK_EMBEDDED) { if (!SendMessageW(wmPtr->wrapper, TK_DEICONIFY, 0, 0)) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't deiconify %s: the container does not support the request", + "cannot deiconify %s: the container does not support the request", winPtr->pathName)); Tcl_SetErrorCode(interp, "TK", "WM", "COMMUNICATION", NULL); return TCL_ERROR; @@ -3786,25 +3786,25 @@ WmGridCmd( } if (reqWidth < 0) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "baseWidth can't be < 0", TCL_INDEX_NONE)); + "baseWidth cannot be < 0", TCL_INDEX_NONE)); Tcl_SetErrorCode(interp, "TK", "VALUE", "GRID", NULL); return TCL_ERROR; } if (reqHeight < 0) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "baseHeight can't be < 0", TCL_INDEX_NONE)); + "baseHeight cannot be < 0", TCL_INDEX_NONE)); Tcl_SetErrorCode(interp, "TK", "VALUE", "GRID", NULL); return TCL_ERROR; } if (widthInc <= 0) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "widthInc can't be <= 0", TCL_INDEX_NONE)); + "widthInc cannot be <= 0", TCL_INDEX_NONE)); Tcl_SetErrorCode(interp, "TK", "VALUE", "GRID", NULL); return TCL_ERROR; } if (heightInc <= 0) { Tcl_SetObjResult(interp, Tcl_NewStringObj( - "heightInc can't be <= 0", TCL_INDEX_NONE)); + "heightInc cannot be <= 0", TCL_INDEX_NONE)); Tcl_SetErrorCode(interp, "TK", "VALUE", "GRID", NULL); return TCL_ERROR; } @@ -3957,7 +3957,7 @@ WmIconbadgeCmd( photo = Tk_FindPhoto(interp, photoname); if (photo == NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't use \"%s\" as icon badge", badgestring)); + "cannot use \"%s\" as icon badge", badgestring)); return TCL_ERROR; } @@ -4159,7 +4159,7 @@ WmIconifyCmd( if (winPtr->flags & TK_EMBEDDED) { if (!SendMessageW(wmPtr->wrapper, TK_ICONIFY, 0, 0)) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't iconify \"%s\": the container does not support the request", + "cannot iconify \"%s\": the container does not support the request", winPtr->pathName)); Tcl_SetErrorCode(interp, "TK", "WM", "ICONIFY", "EMBEDDED", NULL); return TCL_ERROR; @@ -4167,7 +4167,7 @@ WmIconifyCmd( } if (Tk_Attributes((Tk_Window) winPtr)->override_redirect) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't iconify \"%s\": override-redirect flag is set", + "cannot iconify \"%s\": override-redirect flag is set", winPtr->pathName)); Tcl_SetErrorCode(interp, "TK", "WM", "ICONIFY", "OVERRIDE_REDIRECT", NULL); @@ -4175,14 +4175,14 @@ WmIconifyCmd( } if (wmPtr->containerPtr != NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't iconify \"%s\": it is a transient", + "cannot iconify \"%s\": it is a transient", winPtr->pathName)); Tcl_SetErrorCode(interp, "TK", "WM", "ICONIFY", "TRANSIENT", NULL); return TCL_ERROR; } if (wmPtr->iconFor != NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't iconify \"%s\": it is an icon for \"%s\"", + "cannot iconify \"%s\": it is an icon for \"%s\"", winPtr->pathName, Tk_PathName(wmPtr->iconFor))); Tcl_SetErrorCode(interp, "TK", "WM", "ICONIFY", "ICON", NULL); return TCL_ERROR; @@ -4358,7 +4358,7 @@ WmIconphotoCmd( photo = Tk_FindPhoto(interp, Tcl_GetString(objv[i])); if (photo == NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't use \"%s\" as iconphoto: not a photo image", + "cannot use \"%s\" as iconphoto: not a photo image", Tcl_GetString(objv[i]))); Tcl_SetErrorCode(interp, "TK", "WM", "ICONPHOTO", "PHOTO", NULL); return TCL_ERROR; @@ -4532,7 +4532,7 @@ WmIconwindowCmd( } if (!Tk_IsTopLevel(tkwin2)) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't use %s as icon window: not at top level", + "cannot use %s as icon window: not at top level", Tcl_GetString(objv[3]))); Tcl_SetErrorCode(interp, "TK", "WM", "ICONWINDOW", "INNER", NULL); return TCL_ERROR; @@ -5272,7 +5272,7 @@ WmStateCmd( if (objc == 4) { if (wmPtr->iconFor != NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't change state of %s: it is an icon for %s", + "cannot change state of %s: it is an icon for %s", Tcl_GetString(objv[2]), Tk_PathName(wmPtr->iconFor))); Tcl_SetErrorCode(interp, "TK", "WM", "STATE", "ICON", NULL); return TCL_ERROR; @@ -5304,7 +5304,7 @@ WmStateCmd( if (state+1 != SendMessageW(wmPtr->wrapper, TK_STATE, state, 0)) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't change state of %s: the container does not support the request", + "cannot change state of %s: the container does not support the request", winPtr->pathName)); Tcl_SetErrorCode(interp, "TK", "WM", "COMMUNICATION", NULL); return TCL_ERROR; @@ -5323,7 +5323,7 @@ WmStateCmd( } else if (index == OPT_ICONIC) { if (Tk_Attributes((Tk_Window) winPtr)->override_redirect) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't iconify \"%s\": override-redirect flag is set", + "cannot iconify \"%s\": override-redirect flag is set", winPtr->pathName)); Tcl_SetErrorCode(interp, "TK", "WM", "STATE", "OVERRIDE_REDIRECT", NULL); @@ -5331,7 +5331,7 @@ WmStateCmd( } if (wmPtr->containerPtr != NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't iconify \"%s\": it is a transient", + "cannot iconify \"%s\": it is a transient", winPtr->pathName)); Tcl_SetErrorCode(interp, "TK", "WM", "STATE", "TRANSIENT", NULL); @@ -5517,7 +5517,7 @@ WmTransientCmd( if (wmPtr->iconFor != NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't make \"%s\" a transient: it is an icon for %s", + "cannot make \"%s\" a transient: it is an icon for %s", Tcl_GetString(objv[2]), Tk_PathName(wmPtr->iconFor))); Tcl_SetErrorCode(interp, "TK", "WM", "TRANSIENT", "ICON", NULL); return TCL_ERROR; @@ -5527,7 +5527,7 @@ WmTransientCmd( if (wmPtr2->iconFor != NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't make \"%s\" a container: it is an icon for %s", + "cannot make \"%s\" a container: it is an icon for %s", Tcl_GetString(objv[3]), Tk_PathName(wmPtr2->iconFor))); Tcl_SetErrorCode(interp, "TK", "WM", "TRANSIENT", "ICON", NULL); return TCL_ERROR; @@ -5536,7 +5536,7 @@ WmTransientCmd( w = (TkWindow *)w->wmInfoPtr->containerPtr) { if (w == winPtr) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't set \"%s\" as container: would cause management loop", + "cannot set \"%s\" as container: would cause management loop", Tk_PathName(containerPtr))); Tcl_SetErrorCode(interp, "TK", "WM", "TRANSIENT", "SELF", NULL); return TCL_ERROR; @@ -5609,7 +5609,7 @@ WmWithdrawCmd( } if (wmPtr->iconFor != NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't withdraw %s: it is an icon for %s", + "cannot withdraw %s: it is an icon for %s", Tcl_GetString(objv[2]), Tk_PathName(wmPtr->iconFor))); Tcl_SetErrorCode(interp, "TK", "WM", "WITHDRAW", "ICON", NULL); return TCL_ERROR; @@ -5618,7 +5618,7 @@ WmWithdrawCmd( if (winPtr->flags & TK_EMBEDDED) { if (SendMessageW(wmPtr->wrapper, TK_WITHDRAW, 0, 0) < 0) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( - "can't withdraw %s: the container does not support the request", + "cannot withdraw %s: the container does not support the request", Tcl_GetString(objv[2]))); Tcl_SetErrorCode(interp, "TK", "WM", "COMMUNICATION", NULL); return TCL_ERROR; @@ -6071,7 +6071,7 @@ UpdateGeometryInfo( /* * Compute the new position for the upper-left pixel of the window's * decorative frame. This is tricky, because we need to include the border - * widths supplied by a reparented parent in this calculation, but can't + * widths supplied by a reparented parent in this calculation, but cannot * use the parent's current overall size since that may change as a result * of this code. */ @@ -6964,7 +6964,7 @@ TkWmRemoveFromColormapWindows( if (topPtr == NULL) { /* * Ancestors have been deleted, so skip the whole operation. - * Seems like this can't ever happen? + * Seems like this cannot ever happen? */ return; |