IDEA-69798 Since 10.5, main menu is shown in non-modal diff windows on Windows/Linux

This commit is contained in:
Kirill Kalishev
2011-05-17 19:53:11 +04:00
parent d0c4e75abc
commit 2454fa5491
@@ -29,6 +29,7 @@ import com.intellij.openapi.project.ProjectManagerListener;
import com.intellij.openapi.util.ActionCallback;
import com.intellij.openapi.util.DimensionService;
import com.intellij.openapi.util.Disposer;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.wm.*;
import com.intellij.openapi.wm.ex.WindowManagerEx;
import com.intellij.openapi.wm.impl.IdeFrameImpl;
@@ -294,7 +295,10 @@ public class FrameWrapper implements Disposable, DataProvider {
private MyJFrame(IdeFrame parent) throws HeadlessException {
myParent = parent;
setGlassPane(new IdeGlassPaneImpl(getRootPane()));
setJMenuBar(new IdeMenuBar(ActionManagerEx.getInstanceEx(), DataManager.getInstance()));
if (SystemInfo.isMac) {
setJMenuBar(new IdeMenuBar(ActionManagerEx.getInstanceEx(), DataManager.getInstance()));
}
MouseGestureManager.getInstance().add(this);
}