Wish now launches in front when caed from command line, and focus -force works correctly; thanks to Marc Culler for patch

4 files changed, 38 insertions, 20 deletions

diff --git a/macosx/tkMacOSXMenu.c b/macosx/tkMacOSXMenu.c
index e1cdc76..3dadb45 100644
--- a/macosx/tkMacOSXMenu.c
+++ b/macosx/tkMacOSXMenu.c
@@ -830,11 +830,16 @@ TkpSetWindowMenuBar(
  *	Puts the menu associated with a window into the menubar. Should only
  *	be called when the window is in front.
  *
+ *      This is a no-op on all other platforms.  On OS X it is a no-op when
+ *      passed a NULL menuName or a nonexistent menuName, with an exception
+ *      for the first call in a new interpreter.  In that special case, passing a
+ *      NULL menuName installs the default menu.
+ *
  * Results:
  *	None.
  *
  * Side effects:
- *	The menubar is changed.
+ *	The menubar may be changed.
  *
  *----------------------------------------------------------------------
  */
@@ -843,8 +848,7 @@ void
 TkpSetMainMenubar(
     Tcl_Interp *interp,		/* The interpreter of the application */
     Tk_Window tkwin,		/* The frame we are setting up */
-    char *menuName)	/* The name of the menu to put in front. If
-				 * NULL, use the default menu bar. */
+    char *menuName)	/* The name of the menu to put in front.*/
 {
     static Tcl_Interp *currentInterp = NULL;
     TKMenu *menu = nil;
diff --git a/macosx/tkMacOSXSubwindows.c b/macosx/tkMacOSXSubwindows.c
index d557db3..95cc338 100644
--- a/macosx/tkMacOSXSubwindows.c
+++ b/macosx/tkMacOSXSubwindows.c
@@ -149,8 +149,10 @@ XMapWindow(
     if (Tk_IsTopLevel(macWin->winPtr)) {
 	if (!Tk_IsEmbedded(macWin->winPtr)) {
 	    NSWindow *win = TkMacOSXDrawableWindow(window);
-
-	    [win makeKeyAndOrderFront:NSApp];
+	    [NSApp activateIgnoringOtherApps:YES];
+	    if ( [win canBecomeKeyWindow] ) {
+		[win makeKeyAndOrderFront:NSApp];
+	    }
 	    [win windowRef];
 	    TkMacOSXApplyWindowAttributes(macWin->winPtr, win);
 	}
diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index 3233b37..86a1960 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -48,7 +48,7 @@ extern NSString *NSWindowDidOrderOffScreenNotification;
 #endif
 #endif
 
-extern NSString *opaqueTag;
+extern BOOL opaqueTag;
 
 @implementation TKApplication(TKWindowEvent)
 
@@ -940,7 +940,7 @@ ExposeRestrictProc(
 {
     NSWindow *w = [self window];
 
-    if (opaqueTag != NULL) {
+    if (opaqueTag) {
       return YES;
 	} else {
 
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,