mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-11-26 11:47:44 +01:00
codetools: class completion: copying class keyword for virtual methods
git-svn-id: trunk@10326 -
This commit is contained in:
parent
76d67ec1dc
commit
ffb717dbc2
@ -2134,7 +2134,7 @@ begin
|
|||||||
ProcNode:=ANodeExt.Node;
|
ProcNode:=ANodeExt.Node;
|
||||||
if (ProcNode<>nil) and (ANodeExt.ExtTxt3='')
|
if (ProcNode<>nil) and (ANodeExt.ExtTxt3='')
|
||||||
and (ProcNodeHasSpecifier(ProcNode,psOVERRIDE)) then begin
|
and (ProcNodeHasSpecifier(ProcNode,psOVERRIDE)) then begin
|
||||||
ProcCode:=ExtractProcHead(ProcNode,[phpWithStart,phpWithoutClassKeyword,
|
ProcCode:=ExtractProcHead(ProcNode,[phpWithStart,
|
||||||
phpAddClassname,phpWithVarModifiers,phpWithParameterNames,
|
phpAddClassname,phpWithVarModifiers,phpWithParameterNames,
|
||||||
phpWithResultType,phpWithCallingSpecs]);
|
phpWithResultType,phpWithCallingSpecs]);
|
||||||
ProcCall:='inherited '+ExtractProcHead(ProcNode,[phpWithoutClassName,
|
ProcCall:='inherited '+ExtractProcHead(ProcNode,[phpWithoutClassName,
|
||||||
@ -2287,6 +2287,7 @@ var
|
|||||||
if (ANode<>nil) and (ANode.Desc=ctnProcedure)
|
if (ANode<>nil) and (ANode.Desc=ctnProcedure)
|
||||||
and ProcNodeHasSpecifier(ANode,psABSTRACT) then begin
|
and ProcNodeHasSpecifier(ANode,psABSTRACT) then begin
|
||||||
ClassProcs.Delete(AnAVLNode);
|
ClassProcs.Delete(AnAVLNode);
|
||||||
|
ANodeExt.Free;
|
||||||
end;
|
end;
|
||||||
AnAVLNode:=NextAVLNode;
|
AnAVLNode:=NextAVLNode;
|
||||||
end;
|
end;
|
||||||
|
|||||||
@ -754,6 +754,7 @@ end;
|
|||||||
|
|
||||||
function TMethodJumpingCodeTool.GatherProcNodes(StartNode: TCodeTreeNode;
|
function TMethodJumpingCodeTool.GatherProcNodes(StartNode: TCodeTreeNode;
|
||||||
Attr: TProcHeadAttributes; const UpperClassName: string): TAVLTree;
|
Attr: TProcHeadAttributes; const UpperClassName: string): TAVLTree;
|
||||||
|
// create a tree of TCodeTreeNodeExtension
|
||||||
var CurProcName: string;
|
var CurProcName: string;
|
||||||
ANode: TCodeTreeNode;
|
ANode: TCodeTreeNode;
|
||||||
NewNodeExt: TCodeTreeNodeExtension;
|
NewNodeExt: TCodeTreeNodeExtension;
|
||||||
|
|||||||
@ -4780,10 +4780,11 @@ var
|
|||||||
NewWidth, NewHeight: integer;
|
NewWidth, NewHeight: integer;
|
||||||
begin
|
begin
|
||||||
{$IFDEF VerboseSizeMsg}
|
{$IFDEF VerboseSizeMsg}
|
||||||
DebugLn('TWinControl.WMMove A ',Name,':',ClassName,' Message=',dbgs(Message.XPos),',',dbgs(Message.YPos),
|
DebugLn(['TWinControl.WMMove A ',DbgSName(Self),' Message=',Message.XPos,',',Message.YPos,
|
||||||
' BoundsRealized='+dbgs(FBoundsRealized.Left)+','+dbgs(FBoundsRealized.Top),
|
' BoundsRealized=',FBoundsRealized.Left,',',FBoundsRealized.Top,
|
||||||
','+dbgs(FBoundsRealized.Right-FBoundsRealized.Left),
|
' SourceIsInterface=',Message.MoveType=Move_SourceIsInterface,
|
||||||
'x'+dbgs(FBoundsRealized.Bottom-FBoundsRealized.Top));
|
',',FBoundsRealized.Right-FBoundsRealized.Left,
|
||||||
|
'x',FBoundsRealized.Bottom-FBoundsRealized.Top]);
|
||||||
{$ENDIF}
|
{$ENDIF}
|
||||||
NewWidth:=Width;
|
NewWidth:=Width;
|
||||||
NewHeight:=Height;
|
NewHeight:=Height;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user