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

Merged revision(s) 52306 #2b94ec1a7c from trunk:

Browse Source 
IDEIntf: assign OnClick events in RegisterIDEButtonCommand. Issue #30137
........

git-svn-id: branches/fixes_1_6@52314 -
This commit is contained in:
maxim 2016-05-16 22:39:06 +00:00
parent 132a62707f
commit 81b73425cc
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
components/ideintf/idecommands.pas
View File

@ -1697,22 +1697,21 @@ procedure TIDESpecialCommand.SetCommand(const AValue: TIDECommand);
begin
if FCommand = AValue then
Exit;
if FCommand <> nil then
begin
//DebugLn('TIDEMenuCommand.SetCommand OLD ',ShortCutToText(FCommand.AsShortCut),' FCommand.Name=',FCommand.Name,' Name=',Name,' FCommand=',dbgs(Pointer(FCommand)));
if FCommand.OnExecute=OnClick then
FCommand.OnExecute:=nil;
if FCommand.OnExecuteProc=OnClickProc then
FCommand.OnExecuteProc:=nil;
end;
FCommand := AValue;
if FCommand <> nil then
begin
if FCommand.OnExecute = nil then
FCommand.OnExecute := OnClick;
if FCommand.OnExecuteProc = nil then
FCommand.OnExecuteProc := OnClickProc;
//DebugLn('TIDEMenuCommand.SetCommand NEW ',ShortCutToText(FCommand.AsShortCut),' FCommand.Name=',FCommand.Name,' Name=',Name,' FCommand=',dbgs(Pointer(FCommand)));
if (FCommand.OnExecute=nil) and (OnClick<>nil) then
FCommand.OnExecute := OnClick
else
if (OnClick=nil) and (FCommand.OnExecute<>nil) then
OnClick := FCommand.OnExecute;
if (FCommand.OnExecuteProc=nil) and (OnClickProc<>nil) then
FCommand.OnExecuteProc := OnClickProc
else
if (OnClickProc=nil) and (FCommand.OnExecuteProc<>nil) then
OnClickProc := FCommand.OnExecuteProc;
FCommand.UserAdded(Self);
FCommand.Change;
end;