summaryrefslogtreecommitdiffstats
path: root/generic/tkObj.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2013-01-28 11:24:03 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2013-01-28 11:24:03 (GMT)
commitf5cd036029ec84c3e42c672341d77ca013afbc71 (patch)
tree65123df923e2cd33f1a897da5b4a37c2e704270f /generic/tkObj.c
parent13e6c44129865089d8680474141354555450ae04 (diff)
downloadtk-f5cd036029ec84c3e42c672341d77ca013afbc71.zip
tk-f5cd036029ec84c3e42c672341d77ca013afbc71.tar.gz
tk-f5cd036029ec84c3e42c672341d77ca013afbc71.tar.bz2
Convert all Tcl_SetResult calls to Tcl_SetObjResult calls.
Convert Tcl_GetStringFromObj to Tcl_GetString when possible.
Diffstat (limited to 'generic/tkObj.c')
-rw-r--r--generic/tkObj.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/generic/tkObj.c b/generic/tkObj.c
index ed947d3..1ccf3c5 100644
--- a/generic/tkObj.c
+++ b/generic/tkObj.c
@@ -447,7 +447,7 @@ SetPixelFromAny(
double d;
int i, units;
- string = Tcl_GetStringFromObj(objPtr, NULL);
+ string = Tcl_GetString(objPtr);
d = strtod(string, &rest);
if (rest == string) {
@@ -719,13 +719,13 @@ SetMMFromAny(
* ints again from mm obj types.
*/
- (void) Tcl_GetStringFromObj(objPtr, NULL);
+ (void) Tcl_GetString(objPtr);
} else {
/*
* It wasn't a known int or double, so parse it.
*/
- string = Tcl_GetStringFromObj(objPtr, NULL);
+ string = Tcl_GetString(objPtr);
d = strtod(string, &rest);
if (rest == string) {
@@ -834,7 +834,7 @@ TkGetWindowFromObj(
*/
winPtr->tkwin = Tk_NameToWindow(interp,
- Tcl_GetStringFromObj(objPtr, NULL), tkwin);
+ Tcl_GetString(objPtr), tkwin);
if (winPtr->tkwin == NULL) {
/* ASSERT: Tk_NameToWindow has left error message in interp */
return TCL_ERROR;
@@ -880,7 +880,7 @@ SetWindowFromAny(
* Free the old internalRep before setting the new one.
*/
- Tcl_GetStringFromObj(objPtr, NULL);
+ Tcl_GetString(objPtr);
typePtr = objPtr->typePtr;
if ((typePtr != NULL) && (typePtr->freeIntRepProc != NULL)) {
typePtr->freeIntRepProc(objPtr);