From 2454fa54914ae2b2368240a76485dbc29cb36987 Mon Sep 17 00:00:00 2001
From: Kirill Kalishev <kirill.kalishev@jetbrains.com>
Date: Tue, 17 May 2011 19:53:11 +0400
Subject: [PATCH] IDEA-69798 Since 10.5, main menu is shown in non-modal diff
 windows on Windows/Linux

---
 .../src/com/intellij/openapi/ui/FrameWrapper.java           | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/ui/FrameWrapper.java b/platform/platform-impl/src/com/intellij/openapi/ui/FrameWrapper.java
index baa7d6d453b8..6787f3880f58 100644
--- a/platform/platform-impl/src/com/intellij/openapi/ui/FrameWrapper.java
+++ b/platform/platform-impl/src/com/intellij/openapi/ui/FrameWrapper.java
@@ -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);
     }