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

LCL: Copy TAction.OnExecute to TMenuItem.OnClick when assigning TAction. Issue #22644, patch from Anton

Browse Source 
git-svn-id: trunk@40919 -
This commit is contained in:
juha 2013-04-28 21:35:20 +00:00
parent 3964d7f1f3
commit ca340b95bb
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lcl/include/menuactionlink.inc
View File

@ -83,7 +83,7 @@ end;
function TMenuActionLink.IsOnExecuteLinked: Boolean; function TMenuActionLink.IsOnExecuteLinked: Boolean;
begin begin
Result := inherited IsOnExecuteLinked Result := inherited IsOnExecuteLinked
and (@FClient.OnClick = @Action.OnExecute); and CompareMethods(TMethod(FClient.OnClick),TMethod(Action.OnExecute));
end; end;
procedure TMenuActionLink.SetAutoCheck(Value: Boolean); procedure TMenuActionLink.SetAutoCheck(Value: Boolean);

2
lcl/include/menuitem.inc
View File

@ -394,6 +394,8 @@ begin
ShortCut := NewAction.ShortCut; ShortCut := NewAction.ShortCut;
if (not CheckDefaults) or (Visible = True) then if (not CheckDefaults) or (Visible = True) then
Visible := NewAction.Visible; Visible := NewAction.Visible;
if (not CheckDefaults) or not Assigned(OnClick) then
OnClick := NewAction.OnExecute;
end; end;
end; end;