paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-30 20:30:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

cocoa: revert changes done with r61262 #006c5d25d5 (menuDidClose handling). #35625

Browse Source 
git-svn-id: trunk@61286 -
This commit is contained in:
dmitry 2019-05-24 12:52:49 +00:00
parent 8493dec6aa
commit 544969faaf
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lcl/interfaces/cocoa/cocoawsmenus.pas
View File

@ -87,7 +87,7 @@ type
// of the menu. While LCL allows to modify the menu contents when the submenu // of the menu. While LCL allows to modify the menu contents when the submenu
// is about to be activated. // is about to be activated.
procedure menuNeedsUpdate(AMenu: NSMenu); message 'menuNeedsUpdate:'; procedure menuNeedsUpdate(AMenu: NSMenu); message 'menuNeedsUpdate:';
procedure menuDidClose(AMenu: NSMenu); message 'menuDidClose:'; //procedure menuDidClose(AMenu: NSMenu); message 'menuDidClose:';
end; end;
TCocoaMenuItem_HideApp = objcclass(NSMenuItem) TCocoaMenuItem_HideApp = objcclass(NSMenuItem)
@ -386,6 +386,10 @@ begin
menuItemCallback.ItemSelected; menuItemCallback.ItemSelected;
end; 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); procedure TCocoaMenuItem.menuDidClose(AMenu: NSMenu);
var var
par : NSMenu; par : NSMenu;
@ -407,6 +411,7 @@ begin
end; end;
end; end;
end; end;
}
procedure TCocoaMenuItem_HideApp.lclItemSelected(sender: id); procedure TCocoaMenuItem_HideApp.lclItemSelected(sender: id);
begin begin