paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-12-05 00:37:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

cocoa: update attachmenu process, so NSMenu can be added into NSMenuItem as a subitem. #34293

Browse Source 
git-svn-id: trunk@59106 -
This commit is contained in:
dmitry 2018-09-21 00:57:23 +00:00
parent ceb8d157e4
commit 9405a3fe6d
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -455,12 +455,14 @@ var
ParObj : NSObject;
Parent : TCocoaMenu;
item : NSMenuItem;
MenuObj : NSObject;
Menu : NSMenu;
begin
if not Assigned(AMenuItem) or (AMenuItem.Handle=0) or not Assigned(AMenuItem.Parent) or (AMenuItem.Parent.Handle=0) then Exit;
ParObj:=NSObject(AMenuItem.Parent.Handle);
item:=NSMenuItem(AMenuItem.Handle);
if ParObj.isKindOfClass_(NSMenuItem) then
if ParObj.isKindOfClass(NSMenuItem) then
begin
if not NSMenuItem(ParObj).hasSubmenu then
begin
@ -470,12 +472,25 @@ begin
end
else
Parent:=TCocoaMenu(NSMenuItem(ParObj).submenu);
end else if ParObj.isKindOfClass_(NSMenu) then
end else if ParObj.isKindOfClass(NSMenu) then
Parent:=TCocoaMenu(ParObj)
else
Exit;
Parent.insertItem_atIndex(item, AMenuItem.MenuVisibleIndex);
item := nil;
MenuObj := NSObject(AMenuItem.Handle);
if MenuObj.isKindOfClass(NSMenuItem) then
item := NSMenuItem(MenuObj)
else if MenuObj.isKindOfClass(NSMenu) then
begin
Menu := NSMenu(MenuObj);
item := NSMenuItem(NSMenuItem.alloc).initWithTitle_action_keyEquivalent(
ControlTitleToNSStr(AMenuItem.Caption), nil, NSString.string_ );
item.setSubmenu( Menu );
end;
if Assigned(item) then
Parent.insertItem_atIndex(NSMenuItem(item), AMenuItem.MenuVisibleIndex)
end;
{------------------------------------------------------------------------------