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

cocoa: Now the apple menu is minimally functional

Browse Source 
git-svn-id: trunk@49630 -
This commit is contained in:
sekelsenmat 2015-08-10 18:28:39 +00:00
parent 441bf2f002
commit 758c2b909b
1 changed files with 54 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
lcl/interfaces/cocoa/cocoaprivate.pp
View File

@ -33,7 +33,7 @@ uses
// Libs
MacOSAll, CocoaAll, CocoaUtils, CocoaGDIObjects,
// LCL
LMessages, LCLMessageGlue, ExtCtrls, Graphics,
LMessages, LCLMessageGlue, ExtCtrls, Graphics, Forms,
LCLType, LCLProc, Controls, ComCtrls, Spin, StdCtrls;
const
@ -216,7 +216,22 @@ type
procedure lclItemSelected(sender: id); message 'lclItemSelected:';
function lclGetCallback: IMenuItemCallback; override;
function lclIsHandle: Boolean; override;
procedure attachAppleMenuItems(); message 'lclItemSelected';
procedure attachAppleMenuItems(); message 'attachAppleMenuItems';
end;
TCocoaMenuItem_HideApp = objcclass(NSMenuItem)
public
procedure lclItemSelected(sender: id); message 'lclItemSelected:';
end;
TCocoaMenuItem_HideOthers = objcclass(NSMenuItem)
public
procedure lclItemSelected(sender: id); message 'lclItemSelected:';
end;
TCocoaMenuItem_Quit = objcclass(NSMenuItem)
public
procedure lclItemSelected(sender: id); message 'lclItemSelected:';
end;
{ TCocoaButton }
@ -3447,17 +3462,48 @@ end;
procedure TCocoaMenuItem.attachAppleMenuItems();
var
item : NSMenuItem;
ns : NSString;
ns, nsCharCode: NSString;
begin
{if attachedAppleMenuItems then Exit;
if hasSubmenu = nil then Exit;
if attachedAppleMenuItems then Exit;
if not hasSubmenu() then Exit;
nsCharCode := NSStringUtf8('');
// Separator
submenu.insertItem_atIndex(NSMenuItem.separatorItem, submenu.itemArray.count);
// Hide App
ns := NSStringUtf8('Hide ' + Application.Title);
item := TCocoaMenuItem_HideApp.alloc.initWithTitle_action_keyEquivalent(ns,
objcselector('lclItemSelected:'), nsCharCode);
submenu.insertItem_atIndex(item, submenu.itemArray.count);
item.setTarget(item);
ns.release;
// Separator
submenu.insertItem_atIndex(NSMenuItem.separatorItem, submenu.itemArray.count);
// Quit
ns := NSStringUtf8('Quit');
item := TCocoaMenuItem_Quit.alloc.initWithTitle_action_keyEquivalent(ns,
objcselector('lclItemSelected:'), nil);
Parent.insertItem_atIndex(item, itemArray.count);
objcselector('lclItemSelected:'), nsCharCode);
submenu.insertItem_atIndex(item, submenu.itemArray.count);
item.setTarget(item);
ns.release;
// release mem
nsCharCode.release;
attachedAppleMenuItems := True;}
attachedAppleMenuItems := True;
end;
procedure TCocoaMenuItem_HideApp.lclItemSelected(sender: id);
begin
Application.Minimize;
end;
procedure TCocoaMenuItem_HideOthers.lclItemSelected(sender: id);
begin
end;
procedure TCocoaMenuItem_Quit.lclItemSelected(sender: id);
begin
Application.Terminate;
end;
{ TCocoaProgressIndicator }