summaryrefslogtreecommitdiffstats
path: root/macosx/tkMacOSXWm.c
diff options
context:
space:
mode:
authorKevin Walzer <kw@codebykevin.com>2015-03-21 00:44:51 (GMT)
committerKevin Walzer <kw@codebykevin.com>2015-03-21 00:44:51 (GMT)
commitc76fcabd431431b1acfc9d4113781872fcc9fe9b (patch)
tree9c31348825d0133c3800fb172836376aabbb89e8 /macosx/tkMacOSXWm.c
parentc9882c7aeaae398fd75018012a712567852fd788 (diff)
downloadtk-c76fcabd431431b1acfc9d4113781872fcc9fe9b.zip
tk-c76fcabd431431b1acfc9d4113781872fcc9fe9b.tar.gz
tk-c76fcabd431431b1acfc9d4113781872fcc9fe9b.tar.bz2
Remove garbage collections calls as GC is no longer supported on OS X; thanks to Marc Culler for patch
Diffstat (limited to 'macosx/tkMacOSXWm.c')
-rw-r--r--macosx/tkMacOSXWm.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index 429d7aa..fc61c7f 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -786,17 +786,18 @@ TkWmDeadWindow(
[[window parentWindow] removeChildWindow:window];
[window setExcludedFromWindowsMenu:YES];
[window close];
- TkMacOSXUnregisterMacWindow(window);
- if (winPtr->window) {
- ((MacDrawable *) winPtr->window)->view = nil;
+ TkMacOSXUnregisterMacWindow(window);
+ if (winPtr->window) {
+ ((MacDrawable *) winPtr->window)->view = nil;
}
- TkMacOSXMakeCollectableAndRelease(wmPtr->window);
- /* Activate the highest window left on the screen. */
- NSArray *windows = [NSApp orderedWindows];
- NSWindow *front = [windows objectAtIndex:0];
- if ( front && [front canBecomeKeyWindow] ) {
- [front makeKeyAndOrderFront:NSApp];
- }
+ [window release];
+ wmPtr->window = NULL;
+ /* Activate the highest window left on the screen. */
+ NSArray *windows = [NSApp orderedWindows];
+ NSWindow *front = [windows objectAtIndex:0];
+ if ( front && [front canBecomeKeyWindow] ) {
+ [front makeKeyAndOrderFront:NSApp];
+ }
}
ckfree(wmPtr);
winPtr->wmInfoPtr = NULL;
@@ -5486,7 +5487,6 @@ TkMacOSXMakeRealWindowExist(
if (!window) {
Tcl_Panic("couldn't allocate new Mac window");
}
- TkMacOSXMakeUncollectable(window);
TKContentView *contentView = [[TKContentView alloc]
initWithFrame:NSZeroRect];
[window setContentView:contentView];