Tk Source Code

Check-in [95607161]
Login
Bounty program for improvements to Tcl and certain Tcl packages.
Tcl 2019 Conference, Houston/TX, US, Nov 4-8
Send your abstracts to tclconference@googlegroups.com
or submit via the online form by Sep 9.

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Merge trunk
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | revised_text | tip-466
Files: files | file ages | folders
SHA3-256:95607161c91ed927c9e28300f4f82534ed802d5ecd35ee07cbb493ebd0654329
User & Date: jan.nijtmans 2018-10-17 22:24:47
Context
2018-10-19
17:20
merge trunk check-in: c869e595 user: fvogel tags: revised_text, tip-466
2018-10-17
22:24
Merge trunk check-in: 95607161 user: jan.nijtmans tags: revised_text, tip-466
22:24
One more missing type-cast (thanks, Fran├žois! check-in: 696498a3 user: jan.nijtmans tags: trunk
22:10
merge trunk check-in: 17f67e76 user: jan.nijtmans tags: revised_text, tip-466
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to generic/ttk/ttkTheme.c.

988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
	const char *optionName = elementOption->optionName;
	Tcl_Obj *dynamicSetting = Ttk_StyleMap(style, optionName, state);
	Tcl_Obj *widgetValue = 0;
	Tcl_Obj *elementDefault = eclass->defaultValues[i];

	if (optionMap[i]) {
	    widgetValue = *(Tcl_Obj **)
		(widgetRecord + optionMap[i]->objOffset);
	}

	if (widgetValue) {
	    *dest = widgetValue;
	} else if (dynamicSetting) {
	    *dest = dynamicSetting;
	} else {







|







988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
	const char *optionName = elementOption->optionName;
	Tcl_Obj *dynamicSetting = Ttk_StyleMap(style, optionName, state);
	Tcl_Obj *widgetValue = 0;
	Tcl_Obj *elementDefault = eclass->defaultValues[i];

	if (optionMap[i]) {
	    widgetValue = *(Tcl_Obj **)
		((char *)widgetRecord + optionMap[i]->objOffset);
	}

	if (widgetValue) {
	    *dest = widgetValue;
	} else if (dynamicSetting) {
	    *dest = dynamicSetting;
	} else {