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

*** 1,7 ****
  /*
!  * Copyright (c) 2011, 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
--- 1,7 ----
  /*
!  * Copyright (c) 2011, 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
*** 579,590 ****
  
  
  - (void) windowDidBecomeKey: (NSNotification *) notification {
  AWT_ASSERT_APPKIT_THREAD;
      [AWTToolkit eventCountPlusPlus];
-     [CMenuBar activate:self.javaMenuBar modallyDisabled:NO];
      AWTWindow *opposite = [AWTWindow lastKeyWindow];
      [AWTWindow setLastKeyWindow:nil];
  
      [self _deliverWindowFocusEvent:YES oppositeWindow: opposite];
  }
  
--- 579,594 ----
  
  
  - (void) windowDidBecomeKey: (NSNotification *) notification {
  AWT_ASSERT_APPKIT_THREAD;
      [AWTToolkit eventCountPlusPlus];
      AWTWindow *opposite = [AWTWindow lastKeyWindow];
+     if (!IS(self.styleBits, IS_DIALOG)) {
+         [CMenuBar activate:self.javaMenuBar modallyDisabled:NO];
+     } else if ((opposite != NULL) && IS(self.styleBits, IS_MODAL)) {
+         [CMenuBar activate:opposite->javaMenuBar modallyDisabled:YES];
+     }
      [AWTWindow setLastKeyWindow:nil];
  
      [self _deliverWindowFocusEvent:YES oppositeWindow: opposite];
  }