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

IDE: Eliminate a warning about hiding inherited "Update" in MessageView. Formatting.

Browse Source
This commit is contained in:
Juha 2023-06-24 17:45:56 +03:00
parent 640eca41e2
commit fd12aa4370
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ide/etmessageframe.pas
View File

@ -214,7 +214,6 @@ type
procedure OnIdle(Sender: TObject; var {%H-}Done: Boolean); procedure OnIdle(Sender: TObject; var {%H-}Done: Boolean);
procedure OnFilterChanged(Sender: TObject); procedure OnFilterChanged(Sender: TObject);
function GetPageScroll: integer; function GetPageScroll: integer;
function Updating: boolean;
protected protected
FViews: TFPList;// list of TMessagesViewMap FViews: TFPList;// list of TMessagesViewMap
FStates: TMsgCtrlStates; FStates: TMsgCtrlStates;
@ -762,24 +761,21 @@ var
MsgLine: TMessageLine; MsgLine: TMessageLine;
s: string; s: string;
begin begin
Result:=''; Result := '';
if Assigned(Self) then if Self=nil then Exit;
begin
MsgLine := nil; MsgLine := nil;
if aHintLastLine<0 then if aHintLastLine<0 then
Result := Control.GetHeaderText(Self) Result := Control.GetHeaderText(Self)
else if aHintLastLine<Self.Lines.Count then else if aHintLastLine < Lines.Count then
MsgLine := Lines[aHintLastLine] MsgLine := Lines[aHintLastLine]
else else
MsgLine := ProgressLine; MsgLine := ProgressLine;
if MsgLine<>nil then begin if MsgLine<>nil then begin
Result := Control.GetLineText(MsgLine); Result := Control.GetLineText(MsgLine);
s:= ExternalToolList.GetMsgHint(MsgLine.SubTool, MsgLine.MsgID); s := ExternalToolList.GetMsgHint(MsgLine.SubTool, MsgLine.MsgID);
if s<>'' then if s<>'' then
Result += LineEnding+LineEnding + s; Result += LineEnding+LineEnding + s;
end; end;
end;
end; end;
procedure TLMsgWndView.QueueAsyncOnChanged; procedure TLMsgWndView.QueueAsyncOnChanged;
@ -827,8 +823,7 @@ begin
Result:=GetShownLineCount(true,true)>0; Result:=GetShownLineCount(true,true)>0;
end; end;
function TLMsgWndView.GetShownLineCount(WithHeader, WithProgressLine: boolean function TLMsgWndView.GetShownLineCount(WithHeader, WithProgressLine: boolean): integer;
): integer;
begin begin
Result:=Lines.Count; Result:=Lines.Count;
// the header is only shown if there SummaryMsg<>'' or ProgressLine.Msg<>'' or Lines.Count>0 // the header is only shown if there SummaryMsg<>'' or ProgressLine.Msg<>'' or Lines.Count>0
@ -1478,11 +1473,6 @@ begin
{$ENDIF} {$ENDIF}
end; end;
function TMessagesCtrl.Updating: boolean;
begin
Result := fUpdateLock > 0;
end;
function TMessagesCtrl.GetSelectedLine: integer; function TMessagesCtrl.GetSelectedLine: integer;
// Return the first selected line number. // Return the first selected line number.
begin begin
@ -2784,7 +2774,7 @@ end;
procedure TMessagesCtrl.MsgCtrlShowHint(Sender: TObject; HintInfo: PHintInfo); procedure TMessagesCtrl.MsgCtrlShowHint(Sender: TObject; HintInfo: PHintInfo);
begin begin
if Updating then if fUpdateLock > 0 then
exit; exit;
{ No selected 'view' or not specified line } { No selected 'view' or not specified line }
if not Assigned(FHintLastView) or (FHintLastLine = cNotALineHint) then begin if not Assigned(FHintLastView) or (FHintLastLine = cNotALineHint) then begin