Tk Source Code

Check-in [92068c2e]
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 [2fec274fe3]: OS X - menu-2.8[0134] triggers CFURLCopyResourcePropertyForKey failed
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | core-8-6-branch
Files: files | file ages | folders
SHA3-256: 92068c2e8c21de2e4bb20050eda8774c368335d8fdc083bac96eca74157d57a5
User & Date: fvogel 2017-11-11 09:03:30
Context
2017-11-11
19:02
Change to XMapWindow to make embedded toplevels display properly when first mapped. check-in: d8468f85 user: culler tags: core-8-6-branch
18:55
Create new branch named "bug-27c4e4c8" check-in: 9f5304f5 user: culler tags: bug-27c4e4c8
12:50
merge core-8-6-branch check-in: c512b82f user: fvogel tags: canvas_image, tip-489
10:43
Fix [6b2fd1e881]: grid documentation for default for -row is wrong Closed-Leaf check-in: e30324fd user: fvogel tags: bug-6b2fd1e88
09:03
Fix [2fec274fe3]: OS X - menu-2.8[0134] triggers CFURLCopyResourcePropertyForKey failed check-in: 679a4860 user: fvogel tags: trunk
09:03
Fix [2fec274fe3]: OS X - menu-2.8[0134] triggers CFURLCopyResourcePropertyForKey failed check-in: 92068c2e user: fvogel tags: core-8-6-branch
08:43
merge mac-wm-icon branch (because the changes from this branch were just committed separately as a standalone patch in core-8-6-branch) check-in: aaa56ad9 user: fvogel tags: core-8-6-branch
2017-11-04
21:07
Fix [2fec274fe3]: OS X - menu-2.8[0134] triggers CFURLCopyResourcePropertyForKey failed Closed-Leaf check-in: e41d0586 user: fvogel tags: bug-2fec274fe3
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to macosx/tkMacOSXBitmap.c.

294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
	if (image) {
	    [image setSize:size];
	}
    } else {
	string = [NSString stringWithUTF8String:name];
	image = [NSImage imageNamed:string];
	if (!image) {
	    NSURL *url = [NSURL URLWithString:string];
	    if (url) {
		image = [[[NSImage alloc] initWithContentsOfURL:url]
			autorelease];
	    }
	}
	if (image) {
	    size = [image size];






|







294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
	if (image) {
	    [image setSize:size];
	}
    } else {
	string = [NSString stringWithUTF8String:name];
	image = [NSImage imageNamed:string];
	if (!image) {
	    NSURL *url = [NSURL fileURLWithPath:string];
	    if (url) {
		image = [[[NSImage alloc] initWithContentsOfURL:url]
			autorelease];
	    }
	}
	if (image) {
	    size = [image size];