Tk Source Code

Check-in [2f9e63f8]
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:Fix for 5824a992df, images not displaying in Cocoa in label with sunken relief
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 2f9e63f8907ad2b6fe2117c8fd0040762eca384b
User & Date: kevin_walzer 2015-02-28 02:59:12
Context
2015-02-28
03:17
merge mark check-in: 2a868d77 user: kevin_walzer tags: trunk
02:59
Fix for 5824a992df, images not displaying in Cocoa in label with sunken relief check-in: 2f9e63f8 user: kevin_walzer tags: trunk
2015-02-24
15:09
merge mark check-in: 754c58b7 user: dgp tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to macosx/tkMacOSXButton.c.

606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
	int y;
	TkComputeAnchor(butPtr->anchor, tkwin,
			butPtr->padX + butPtr->borderWidth,
			butPtr->padY + butPtr->borderWidth,
			width + butPtr->indicatorSpace,
			height, &x, &y);
        x += butPtr->indicatorSpace;
	if (dpPtr->relief == TK_RELIEF_SUNKEN) {
	  x += dpPtr->offset;
	  y += dpPtr->offset;
	} else if (dpPtr->relief == TK_RELIEF_RAISED) {
	  x -= dpPtr->offset;
	  y -= dpPtr->offset;
	}
	if (pressed) {
	  x += dpPtr->offset;
	  y += dpPtr->offset;
	}
	imageXOffset += x;
	imageYOffset += y;







<
<
<
<
<
<
<







606
607
608
609
610
611
612







613
614
615
616
617
618
619
	int y;
	TkComputeAnchor(butPtr->anchor, tkwin,
			butPtr->padX + butPtr->borderWidth,
			butPtr->padY + butPtr->borderWidth,
			width + butPtr->indicatorSpace,
			height, &x, &y);
        x += butPtr->indicatorSpace;







	if (pressed) {
	  x += dpPtr->offset;
	  y += dpPtr->offset;
	}
	imageXOffset += x;
	imageYOffset += y;