From 544969faaf5f6fb4355427af47617da15e2002f4 Mon Sep 17 00:00:00 2001 From: dmitry Date: Fri, 24 May 2019 12:52:49 +0000 Subject: [PATCH] cocoa: revert changes done with r61262 #006c5d25d5 (menuDidClose handling). #35625 git-svn-id: trunk@61286 - --- lcl/interfaces/cocoa/cocoawsmenus.pas | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lcl/interfaces/cocoa/cocoawsmenus.pas b/lcl/interfaces/cocoa/cocoawsmenus.pas index b3a15fbd1b..07240e7d59 100644 --- a/lcl/interfaces/cocoa/cocoawsmenus.pas +++ b/lcl/interfaces/cocoa/cocoawsmenus.pas @@ -87,7 +87,7 @@ type // of the menu. While LCL allows to modify the menu contents when the submenu // is about to be activated. procedure menuNeedsUpdate(AMenu: NSMenu); message 'menuNeedsUpdate:'; - procedure menuDidClose(AMenu: NSMenu); message 'menuDidClose:'; + //procedure menuDidClose(AMenu: NSMenu); message 'menuDidClose:'; end; TCocoaMenuItem_HideApp = objcclass(NSMenuItem) @@ -386,6 +386,10 @@ begin menuItemCallback.ItemSelected; end; +{ menuDidClose should not change the structure of the menu. + The restructuring is causing issues on Apple's special menus (i.e. HELP menu) + See bug #35625 + procedure TCocoaMenuItem.menuDidClose(AMenu: NSMenu); var par : NSMenu; @@ -407,6 +411,7 @@ begin end; end; end; +} procedure TCocoaMenuItem_HideApp.lclItemSelected(sender: id); begin