Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8007006: [macosx] Closing subwindow loses main window menus
authorleonidr
Thu, 31 Jan 2013 18:25:59 +0400
changeset 15505 f31ab5cb8bb9
parent 15339 8eb680ee0b6d
child 15506 b947efcfde08
8007006: [macosx] Closing subwindow loses main window menus Reviewed-by: anthony
jdk/src/macosx/native/sun/awt/AWTWindow.m file | annotate | diff | comparison | revisions 
--- a/jdk/src/macosx/native/sun/awt/AWTWindow.m	Wed Jan 30 10:18:33 2013 -0800
+++ b/jdk/src/macosx/native/sun/awt/AWTWindow.m	Thu Jan 31 18:25:59 2013 +0400
@@ -813,9 +813,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);
jdk-sandbox