diff options
| author | patthoyts <patthoyts@noemail.net> | 2007-05-11 11:00:46 (GMT) |
|---|---|---|
| committer | patthoyts <patthoyts@noemail.net> | 2007-05-11 11:00:46 (GMT) |
| commit | 5d749b5ae31bd799049f505d726843e84945acb8 (patch) | |
| tree | 96af71e51cf458074c75b0ad500059de77603dd2 /generic | |
| parent | b51c6c8e098f7109945f1159749642b493d77a15 (diff) | |
| download | tk-5d749b5ae31bd799049f505d726843e84945acb8.zip tk-5d749b5ae31bd799049f505d726843e84945acb8.tar.gz tk-5d749b5ae31bd799049f505d726843e84945acb8.tar.bz2 | |
bug #1716613 propagate error from TkDeleteNamedFont.
FossilOrigin-Name: b940710a354f0948e5ddbdf80301eb7df4658f9f
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkFont.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/generic/tkFont.c b/generic/tkFont.c index 14fe799..6bc8196 100644 --- a/generic/tkFont.c +++ b/generic/tkFont.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkFont.c,v 1.34 2007/05/04 21:29:22 patthoyts Exp $ + * RCS: @(#) $Id: tkFont.c,v 1.35 2007/05/11 11:00:48 patthoyts Exp $ */ #include "tkPort.h" @@ -682,7 +682,7 @@ Tk_FontObjCmd( break; } case FONT_DELETE: { - int i; + int i, result = TCL_OK; char *string; /* @@ -694,11 +694,11 @@ Tk_FontObjCmd( Tcl_WrongNumArgs(interp, 2, objv, "fontname ?fontname ...?"); return TCL_ERROR; } - for (i = 2; i < objc; i++) { + for (i = 2; i < objc && result == TCL_OK; i++) { string = Tcl_GetString(objv[i]); - TkDeleteNamedFont(interp, tkwin, string); + result = TkDeleteNamedFont(interp, tkwin, string); } - break; + return result; } case FONT_FAMILIES: { int skip; |