src/macosx/native/sun/awt/AWTWindow.m

Print this page

        

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.  Oracle designates this

@@ -534,12 +534,20 @@
 
 
 - (void) windowDidBecomeKey: (NSNotification *) notification {
 AWT_ASSERT_APPKIT_THREAD;
     [AWTToolkit eventCountPlusPlus];
-    [CMenuBar activate:self.javaMenuBar modallyDisabled:NO];
+
     AWTWindow *opposite = [AWTWindow lastKeyWindow];
+    if (self.javaMenuBar != NULL) {
+        [CMenuBar activate:self.javaMenuBar modallyDisabled:NO];
+    } else {
+        if (IS(self.styleBits, MODAL) && opposite != NULL) {
+            [CMenuBar activate:opposite->javaMenuBar modallyDisabled:YES];
+        }
+    }
+    
     [AWTWindow setLastKeyWindow:nil];
 
     [self _deliverWindowFocusEvent:YES oppositeWindow: opposite];
 }