From b61d8f9ba2586931f7ba1b7467898fc18ef09033 Mon Sep 17 00:00:00 2001
From: dmitry <dmitry@lazarus-ide.org>
Date: Mon, 24 Jun 2019 15:24:14 +0000
Subject: [PATCH] cocoa: move attaching of AppleMenu into cocoaWS class (as at
 windows class). Resolving glitches with an empty menu

git-svn-id: trunk@61468 -
---
 lcl/interfaces/cocoa/cocoaint.pas     | 4 ++++
 lcl/interfaces/cocoa/cocoawsforms.pas | 1 -
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/lcl/interfaces/cocoa/cocoaint.pas b/lcl/interfaces/cocoa/cocoaint.pas
index 9729821b36..df0a6d6a11 100644
--- a/lcl/interfaces/cocoa/cocoaint.pas
+++ b/lcl/interfaces/cocoa/cocoaint.pas
@@ -680,6 +680,10 @@ begin
   PrevMenu.retain;
 
   PrevLCLMenu := CurLCLMenu;
+
+  if (lNSMenu.isKindOfClass(TCocoaMenu)) then
+    TCocoaMenu(lNSMenu).attachAppleMenu();
+
   NSApp.setMainMenu(lNSMenu);
   CurLCLMenu := ALCLMenu;
 
diff --git a/lcl/interfaces/cocoa/cocoawsforms.pas b/lcl/interfaces/cocoa/cocoawsforms.pas
index d9abd6a166..b1de3d3bca 100644
--- a/lcl/interfaces/cocoa/cocoawsforms.pas
+++ b/lcl/interfaces/cocoa/cocoawsforms.pas
@@ -367,7 +367,6 @@ begin
       if NSObject(ACustForm.Menu.Handle).isKindOfClass_(TCocoaMenu) then
       begin
         CocoaWidgetSet.SetMainMenu(ACustForm.Menu.Handle, ACustForm.Menu);
-        TCocoaMenu(ACustForm.Menu.Handle).attachAppleMenu();
       end
       else
         debugln('Warning: Menu does not have a valid handle.');