changeset 5772:dc53b95a5db7

8007006: [macosx] Closing subwindow loses main window menus Reviewed-by: art, serb
author leonidr
date Sat, 16 Feb 2013 02:39:41 +0400
parents 2f5d66a7d930
children 0360e7370921
files src/macosx/native/sun/awt/AWTWindow.m
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/macosx/native/sun/awt/AWTWindow.m	Thu Feb 14 22:17:30 2013 +0000
+++ b/src/macosx/native/sun/awt/AWTWindow.m	Sat Feb 16 02:39:41 2013 +0400
@@ -829,9 +829,9 @@
         if ([nsWindow isKeyWindow]) [window.javaMenuBar deactivate];
         window.javaMenuBar = menuBar;
 
-        // if ([self isKeyWindow]) {
-        [CMenuBar activate:window.javaMenuBar modallyDisabled:NO];
-        // }
+        if ([nsWindow isKeyWindow]) {
+            [CMenuBar activate:window.javaMenuBar modallyDisabled:NO];
+        }
     }];
 
 JNF_COCOA_EXIT(env);