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

Carbon: fixed crash with menu item of trayicon on MacOsX Lion. issue #19693

Browse Source 
git-svn-id: trunk@31598 -
This commit is contained in:
zeljko 2011-07-08 07:15:55 +00:00
parent e121294b60
commit 880fd18517
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lcl/interfaces/carbon/carbontrayicon.inc
View File

@ -426,7 +426,7 @@ var
AMenuItem: NSMenuItem; AMenuItem: NSMenuItem;
LCLMenu: TMenuItem; LCLMenu: TMenuItem;
begin begin
AMenuItem := NSMenuItem.CreateWithHandle(sender); AMenuItem := NSMenuItem.CreateWithHandle(lobjc.id(_cmd));
LCLMenu := TMenuItem(PtrInt(AMenuItem.Tag())); LCLMenu := TMenuItem(PtrInt(AMenuItem.Tag()));
if (LCLMenu <> nil) and Assigned(LCLMenu.OnClick) then LCLMenu.OnClick(LCLMenu); if (LCLMenu <> nil) and Assigned(LCLMenu.OnClick) then LCLMenu.OnClick(LCLMenu);
end; end;
@ -501,7 +501,8 @@ begin
APrivateTrayIcon.item := NSStatusItem.CreateWithHandle(APrivateTrayIcon.bar.statusItemWithLength(NSSquareStatusItemLength)); APrivateTrayIcon.item := NSStatusItem.CreateWithHandle(APrivateTrayIcon.bar.statusItemWithLength(NSSquareStatusItemLength));
APrivateTrayIcon.item.retain(); APrivateTrayIcon.item.retain();
APrivateTrayIcon.item.setImage(APrivateTrayIcon.image.Handle); if Assigned(APrivateTrayIcon.image) and Assigned(APrivateTrayIcon.Image.Handle) then
APrivateTrayIcon.item.setImage(APrivateTrayIcon.image.Handle);
APrivateTrayIcon.item.setHighlightMode(LongBool(YES)); APrivateTrayIcon.item.setHighlightMode(LongBool(YES));
{ Inserts the menu } { Inserts the menu }
@ -540,10 +541,14 @@ begin
{ Updates the image } { Updates the image }
APrivateTrayIcon.image.Free; if Assigned(APrivateTrayIcon.Image) then
APrivateTrayIcon.image.Free;
APrivateTrayIcon.image := APrivateTrayIcon.ConvertTIconToNSImage(ATrayIcon.Icon); if Assigned(ATrayIcon.Icon) then
APrivateTrayIcon.item.setImage(APrivateTrayIcon.image.Handle); begin
APrivateTrayIcon.image := APrivateTrayIcon.ConvertTIconToNSImage(ATrayIcon.Icon);
APrivateTrayIcon.item.setImage(APrivateTrayIcon.image.Handle);
end;
{ Inserts the menu } { Inserts the menu }