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

lcl: make TMenu.SetImages safer and more correct

Browse Source 
git-svn-id: trunk@21781 -
This commit is contained in:
paul 2009-09-20 07:54:14 +00:00
parent 634d3996d9
commit 834d683851
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lcl/include/menu.inc
View File

@ -45,7 +45,17 @@ end;
------------------------------------------------------------------------------}
procedure TMenu.SetImages(const AValue: TCustomImageList);
begin
if FImages <> nil then
begin
FImages.UnRegisterChanges(FImageChangeLink);
FImages.RemoveFreeNotification(Self);
end;
FImages := AValue;
if FImages <> nil then
begin
FImages.FreeNotification(Self);
FImages.RegisterChanges(FImageChangeLink);
end;
FItems.UpdateImages;
end;
@ -282,12 +292,8 @@ end;
procedure TMenu.Notification(AComponent: TComponent; Operation: TOperation);
begin
inherited Notification(AComponent, Operation);
if Operation = opRemove then
if AComponent = FImages then
begin
FImages := nil;
FItems.UpdateImages;
end;
if (Operation = opRemove) and (AComponent = FImages) then
Images := nil;
end;
procedure TMenu.SetChildOrder(Child: TComponent; Order: Integer);