Tk Source Code

Check-in [a75f7fbf]
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:merge trunk
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | rc0 | core-8-6-4-rc
Files: files | file ages | folders
SHA1: a75f7fbf4982c217cbab3c98f22bc333ca250c2b
User & Date: dgp 2015-03-06 12:52:02
Context
2015-03-11
13:52
merge trunk Closed-Leaf check-in: d8717ce1 user: dgp tags: rc1, release, core-8-6-4, core-8-6-4-rc
2015-03-06
12:52
merge trunk check-in: a75f7fbf user: dgp tags: rc0, core-8-6-4-rc
12:51
merge mark check-in: b16d00d5 user: dgp tags: trunk
2015-03-05
16:25
merge trunk check-in: 1a123d5d user: dgp tags: core-8-6-4-rc
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to macosx/tkMacOSXWm.c.

780
781
782
783
784
785
786

787
788
789
790
791
792
793
     * own their portPtr's.
     */

    NSWindow *window = wmPtr->window;

    if (window && !Tk_IsEmbedded(winPtr) ) {
	[[window parentWindow] removeChildWindow:window];

	[window close];
	TkMacOSXUnregisterMacWindow(window);
	if (winPtr->window) {
	    ((MacDrawable *) winPtr->window)->view = nil;
	}
	TkMacOSXMakeCollectableAndRelease(wmPtr->window);
    }






>







780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
     * own their portPtr's.
     */

    NSWindow *window = wmPtr->window;

    if (window && !Tk_IsEmbedded(winPtr) ) {
	[[window parentWindow] removeChildWindow:window];
	[window setExcludedFromWindowsMenu:YES];
	[window close];
	TkMacOSXUnregisterMacWindow(window);
	if (winPtr->window) {
	    ((MacDrawable *) winPtr->window)->view = nil;
	}
	TkMacOSXMakeCollectableAndRelease(wmPtr->window);
    }