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

cocoa: cleaning up warnings in CocoaWSMenus

Browse Source 
git-svn-id: trunk@56756 -
This commit is contained in:
dmitry 2017-12-16 05:29:56 +00:00
parent 84920379fa
commit 7e51c62172
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,6 +39,7 @@ type
IMenuItemCallback = interface(ICommonCallBack) IMenuItemCallback = interface(ICommonCallBack)
procedure ItemSelected; procedure ItemSelected;
function MenuItemTarget: TMenuItem;
end; end;
{ TLCLMenuItemCallback } { TLCLMenuItemCallback }
@ -49,6 +50,7 @@ type
public public
constructor Create(AOwner: NSObject; AMenuItemTarget: TMenuItem); reintroduce; constructor Create(AOwner: NSObject; AMenuItemTarget: TMenuItem); reintroduce;
procedure ItemSelected; procedure ItemSelected;
function MenuItemTarget: TMenuItem;
end; end;
TCocoaMenuItem = objcclass; TCocoaMenuItem = objcclass;
@ -166,6 +168,11 @@ begin
LCLMessageGlue.DeliverMessage(FMenuItemTarget,Msg); LCLMessageGlue.DeliverMessage(FMenuItemTarget,Msg);
end; end;
function TLCLMenuItemCallback.MenuItemTarget: TMenuItem;
begin
Result:=FMenuItemTarget;
end;
{ TCocoaMenu } { TCocoaMenu }
function TCocoaMenu.lclIsHandle: Boolean; function TCocoaMenu.lclIsHandle: Boolean;
@ -262,7 +269,7 @@ function TCocoaMenuItem.GetMenuItemHandle(): TMenuItem;
begin begin
Result := nil; Result := nil;
if menuItemCallback = nil then Exit; if menuItemCallback = nil then Exit;
Result := TLCLMenuItemCallback(menuItemCallback).FMenuItemTarget; Result := menuItemCallback.MenuItemTarget;
end; end;
procedure TCocoaMenuItem.lclItemSelected(sender:id); procedure TCocoaMenuItem.lclItemSelected(sender:id);
@ -392,12 +399,12 @@ end;
// used from the MenuMadness example // used from the MenuMadness example
class function TCocoaWSMenuItem.NSMenuCheckmark: NSImage; class function TCocoaWSMenuItem.NSMenuCheckmark: NSImage;
begin begin
Result:=NSImage.imageNamed(NSString.alloc.initWithCString('NSMenuCheckmark')); Result:=NSImage.imageNamed(NSStringUtf8('NSMenuCheckmark'));
end; end;
class function TCocoaWSMenuItem.NSMenuRadio: NSImage; class function TCocoaWSMenuItem.NSMenuRadio: NSImage;
begin begin
Result:=NSImage.imageNamed(NSString.alloc.initWithCString('NSMenuRadio')) Result:=NSImage.imageNamed(NSStringUtf8('NSMenuRadio'))
end; end;
class function TCocoaWSMenuItem.isSeparator(const ACaption: AnsiString): Boolean; class function TCocoaWSMenuItem.isSeparator(const ACaption: AnsiString): Boolean;