1 files changed, 25 insertions, 13 deletions

diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index c824afc..91c6858 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -55,7 +55,7 @@
 
 /*Objects for use in setting background color and opacity of window.*/
 NSColor *colorName = NULL;
-NSString *opaqueTag = NULL;
+BOOL opaqueTag = FALSE;
 
 static const struct {
     const UInt64 validAttrs, defaultAttrs, forceOnAttrs, forceOffAttrs;
@@ -790,11 +790,17 @@ TkWmDeadWindow(
 	[[window parentWindow] removeChildWindow:window];
 	[window setExcludedFromWindowsMenu:YES];
 	[window close];
-	TkMacOSXUnregisterMacWindow(window);
-	if (winPtr->window) {
-	    ((MacDrawable *)winPtr->window)->view = nil;
-	}
-	TkMacOSXMakeCollectableAndRelease(wmPtr->window);
+    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];
+        }
     }
 
     ckfree((char *) wmPtr);
@@ -5055,7 +5061,7 @@ TkUnsupported1ObjCmd(
     	    colorName = [NSColor clearColor]; //use systemTransparent in Tk scripts to match
     	}
     	if (Tcl_StringMatch(Tcl_GetString(objv[i]), "*opacity*") == 1) {
-    	    opaqueTag=@"YES";
+    	    opaqueTag=YES;
     	}
     }
 
@@ -5447,7 +5453,7 @@ TkMacOSXMakeRealWindowExist(
     	[window setBackgroundColor: colorName];
     }
 
-    if (opaqueTag != NULL) {
+    if (opaqueTag) {
 #ifdef TK_GOT_AT_LEAST_SNOW_LEOPARD
     	[window setOpaque: opaqueTag];
 #else
@@ -5855,15 +5861,21 @@ TkpChangeFocus(
 				 * didn't originally belong to topLevelPtr's
 				 * application. */
 {
-    /*
-     * We don't really need to do anything on the Mac. Tk will keep all this
-     * state for us.
-     */
-
     if (winPtr->atts.override_redirect) {
 	return 0;
     }
 
+    if (Tk_IsTopLevel(winPtr) && !Tk_IsEmbedded(winPtr) ){
+    	NSWindow *win = TkMacOSXDrawableWindow(winPtr->window);
+    	TkWmRestackToplevel(winPtr, Above, NULL);
+    	if (force ) {
+    	    [NSApp activateIgnoringOtherApps:YES];
+    	}
+	if ( win && [win canBecomeKeyWindow] ) {
+	    [win makeKeyAndOrderFront:NSApp];
+	}
+    }
+	
     /*
      * Remember the current serial number for the X server and issue a dummy
      * server request. This marks the position at which we changed the focus,