Tk Source Code

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

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

Overview
Comment:One more missing type-cast (thanks, Fran├žois!
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 696498a3cdcb5d16ed21b24e6be3af7f96149ec8a9214b384710d6dab5d1f3b9
User & Date: jan.nijtmans 2018-10-17 22:24:22
Context
2018-10-17
22:30
Add warning -Wpointer-arith, so we detect things that MSVC cannot handle check-in: 80f3b2ce user: jan.nijtmans tags: trunk
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:08
Missing type-casts. This only compiles on gcc, not on MSVC (e.g.) check-in: 2e104ca5 user: jan.nijtmans tags: trunk
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 {