diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-11-28 12:58:44 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-11-28 12:58:44 (GMT) |
| commit | b75d6f4db8a4fed4a780dcdf3e99785b8dfc8421 (patch) | |
| tree | b70668d591636a76e3805f075e7a2e8d20c1cfa2 /generic/tkStubInit.c | |
| parent | 130a07781896bb539ff5561c082fa57070f91847 (diff) | |
| download | tk-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/tkStubInit.c')
| -rw-r--r-- | generic/tkStubInit.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c index f1faf27..82d2511 100644 --- a/generic/tkStubInit.c +++ b/generic/tkStubInit.c @@ -39,10 +39,15 @@ MODULE_SCOPE const TkStubs tkStubs; #undef Tk_MainEx #undef Tk_FreeXId +#undef Tk_FreeStyleFromObj +#undef Tk_GetStyleFromObj #ifdef TK_NO_DEPRECATED +#define Tk_MainEx 0 #define Tk_FreeXId 0 +#define Tk_FreeStyleFromObj 0 +#define Tk_GetStyleFromObj 0 #define Tk_PhotoPutBlock_NoComposite 0 #define Tk_PhotoPutZoomedBlock_NoComposite 0 #define Tk_PhotoExpand_Panic 0 @@ -55,8 +60,13 @@ doNothing(void) { /* dummy implementation, no need to do anything */ } - #define Tk_FreeXId ((void (*)(Display *, XID)) doNothing) +#define Tk_FreeStyleFromObj ((void (*)(Tcl_Obj *)) doNothing) +#define Tk_GetStyleFromObj getStyleFromObj +static Tk_Style Tk_GetStyleFromObj(Tcl_Obj *obj) +{ + return Tk_AllocStyleFromObj(NULL, obj); +} #endif #ifdef _WIN32 |