Tk Source Code

Check-in [c343244c]
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 8.5
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | core-8-5-18-rc
Files: files | file ages | folders
SHA1: c343244c7f2f3276cbff5a6032def8c1d1961de0
User & Date: dgp 2015-03-06 12:48:02
Context
2015-03-06
14:02
update release date Closed-Leaf check-in: 46e08e5a user: dgp tags: core-8-5-18, core-8-5-18-rc
12:48
merge 8.5 check-in: c343244c user: dgp tags: core-8-5-18-rc
02:45
Fix for crash in deleted toplevels when not removed from Cocoa window menu; thanks to Marc Culler for patch check-in: 225542ce user: kevin_walzer tags: core-8-5-branch
2015-03-05
16:25
merge 8.5 check-in: c9d80a11 user: dgp tags: core-8-5-18-rc
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to macosx/tkMacOSXWm.c.

784
785
786
787
788
789
790

791
792
793
794
795
796
797
     * for embedded windows, they don't go in the window list, and they do not
     * 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);
    }






>







784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
     * for embedded windows, they don't go in the window list, and they do not
     * 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);
    }