summaryrefslogtreecommitdiffstats
path: root/generic/tkStyle.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2021-04-23 09:55:01 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2021-04-23 09:55:01 (GMT)
commit8c01d5fea4cbdd448a644bfaf18e9dfc96843b61 (patch)
tree38796a80f2a9ec50b88ff82ff70a61a03abd3ca2 /generic/tkStyle.c
parent668875a4157628ad8e22c8873000773a5456a778 (diff)
downloadtk-8c01d5fea4cbdd448a644bfaf18e9dfc96843b61.zip
tk-8c01d5fea4cbdd448a644bfaf18e9dfc96843b61.tar.gz
tk-8c01d5fea4cbdd448a644bfaf18e9dfc96843b61.tar.bz2
Add more implicit type-casts. Backported from 8.7
Diffstat (limited to 'generic/tkStyle.c')
-rw-r--r--generic/tkStyle.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/generic/tkStyle.c b/generic/tkStyle.c
index 1289f14..14bae66 100644
--- a/generic/tkStyle.c
+++ b/generic/tkStyle.c
@@ -1402,14 +1402,10 @@ Tk_AllocStyleFromObj(
Tcl_Obj *objPtr) /* Object containing name of the style to
* retrieve. */
{
- Style *stylePtr;
-
if (objPtr->typePtr != &styleObjType) {
SetStyleFromAny(interp, objPtr);
}
- stylePtr = objPtr->internalRep.twoPtrValue.ptr1;
-
- return (Tk_Style) stylePtr;
+ return (Tk_Style)objPtr->internalRep.twoPtrValue.ptr1;
}
/*
@@ -1439,7 +1435,7 @@ Tk_GetStyleFromObj(
SetStyleFromAny(NULL, objPtr);
}
- return objPtr->internalRep.twoPtrValue.ptr1;
+ return (Tk_Style)objPtr->internalRep.twoPtrValue.ptr1;
}
/*