summaryrefslogtreecommitdiffstats
path: root/generic/tkDecls.h
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2017-11-28 12:58:44 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2017-11-28 12:58:44 (GMT)
commitb75d6f4db8a4fed4a780dcdf3e99785b8dfc8421 (patch)
treeb70668d591636a76e3805f075e7a2e8d20c1cfa2 /generic/tkDecls.h
parent130a07781896bb539ff5561c082fa57070f91847 (diff)
downloadtk-b75d6f4db8a4fed4a780dcdf3e99785b8dfc8421.zip
tk-b75d6f4db8a4fed4a780dcdf3e99785b8dfc8421.tar.gz
tk-b75d6f4db8a4fed4a780dcdf3e99785b8dfc8421.tar.bz2
Fix shimmering in the "style" Tcl_ObjType: If a Tk_Style cannot be found, don't convert the Tcl_Obj to a styleObjType, but handle the error-situation as other objTypes do.
Also convert Tk_GetStyleFromObj() and Tk_FreeStyleFromObj() to macro's (but keep the entries in the stub table).
Diffstat (limited to 'generic/tkDecls.h')
-rw-r--r--generic/tkDecls.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/generic/tkDecls.h b/generic/tkDecls.h
index 8ba2f44..2e498af 100644
--- a/generic/tkDecls.h
+++ b/generic/tkDecls.h
@@ -1738,6 +1738,11 @@ extern const TkStubs *tkStubsPtr;
#undef Tk_FreeXId
#define Tk_FreeXId(display,xid)
+#undef Tk_GetStyleFromObj
+#undef Tk_FreeStyleFromObj
+#define Tk_GetStyleFromObj(obj) Tk_AllocStyleFromObj(NULL, obj)
+#define Tk_FreeStyleFromObj(obj) /* no-op */
+
#if defined(_WIN32) && defined(UNICODE)
# define Tk_MainEx Tk_MainExW