diff options
| author | donal.k.fellows@manchester.ac.uk <dkf> | 2008-10-05 18:22:21 (GMT) |
|---|---|---|
| committer | donal.k.fellows@manchester.ac.uk <dkf> | 2008-10-05 18:22:21 (GMT) |
| commit | a21256d499833c2885e43967cf77be2934dad4e6 (patch) | |
| tree | 57b5f8cd5ff8ef866da62495bc435946f4655c50 /generic/tkImage.c | |
| parent | 112dd0c62b3fffdeb03e0be53a9dea3920e59f27 (diff) | |
| download | tk-a21256d499833c2885e43967cf77be2934dad4e6.zip tk-a21256d499833c2885e43967cf77be2934dad4e6.tar.gz tk-a21256d499833c2885e43967cf77be2934dad4e6.tar.bz2 | |
Greatly clean up Tk's handling of the writability of the Tcl result object.
Diffstat (limited to 'generic/tkImage.c')
| -rw-r--r-- | generic/tkImage.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/generic/tkImage.c b/generic/tkImage.c index 8b389be..db6352c 100644 --- a/generic/tkImage.c +++ b/generic/tkImage.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: tkImage.c,v 1.37 2008/07/23 23:24:21 nijtmans Exp $ + * RCS: @(#) $Id: tkImage.c,v 1.38 2008/10/05 18:22:21 dkf Exp $ */ #include "tkInt.h" @@ -413,19 +413,20 @@ Tk_ImageObjCmd( switch ((enum options) index) { case IMAGE_HEIGHT: - Tcl_SetIntObj(Tcl_GetObjResult(interp), masterPtr->height); + Tcl_SetObjResult(interp, Tcl_NewIntObj(masterPtr->height)); break; case IMAGE_INUSE: - Tcl_SetBooleanObj(Tcl_GetObjResult(interp), - masterPtr->typePtr!=NULL && masterPtr->instancePtr!=NULL); + Tcl_SetObjResult(interp, Tcl_NewBooleanObj( + masterPtr->typePtr && masterPtr->instancePtr)); break; case IMAGE_TYPE: if (masterPtr->typePtr != NULL) { - Tcl_SetResult(interp, masterPtr->typePtr->name, TCL_STATIC); + Tcl_SetObjResult(interp, + Tcl_NewStringObj(masterPtr->typePtr->name, -1)); } break; case IMAGE_WIDTH: - Tcl_SetIntObj(Tcl_GetObjResult(interp), masterPtr->width); + Tcl_SetObjResult(interp, Tcl_NewIntObj(masterPtr->width)); break; default: Tcl_Panic("can't happen"); |