diff options
| author | fvogel <fvogelnew1@free.fr> | 2021-11-16 20:39:47 (GMT) |
|---|---|---|
| committer | fvogel <fvogelnew1@free.fr> | 2021-11-16 20:39:47 (GMT) |
| commit | d8f50ac067d2f0df387ca0b0c46278c2464efc8b (patch) | |
| tree | 4c40167ca8b673d38459b4478944b8bc60cc4a7f /generic/tkStyle.c | |
| parent | c56ea97892bf4b5716fd0c88709b0ef0cb130995 (diff) | |
| parent | a9827f93eadc2978316098553e09406dae1f5520 (diff) | |
| download | tk-bug-b1d115fa60.zip tk-bug-b1d115fa60.tar.gz tk-bug-b1d115fa60.tar.bz2 | |
Merge 8.6bug-b1d115fa60
Diffstat (limited to 'generic/tkStyle.c')
| -rw-r--r-- | generic/tkStyle.c | 8 |
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; } /* |