From ffb717dbc23e403b6ecc8e51df6e4196c0a87df6 Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Wed, 13 Dec 2006 09:19:05 +0000
Subject: [PATCH] codetools: class completion: copying class keyword for
 virtual methods

git-svn-id: trunk@10326 -
---
 components/codetools/codecompletiontool.pas | 3 ++-
 components/codetools/methodjumptool.pas     | 1 +
 lcl/include/wincontrol.inc                  | 9 +++++----
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/components/codetools/codecompletiontool.pas b/components/codetools/codecompletiontool.pas
index 5cba1430aa..b774ff838b 100644
--- a/components/codetools/codecompletiontool.pas
+++ b/components/codetools/codecompletiontool.pas
@@ -2134,7 +2134,7 @@ begin
     ProcNode:=ANodeExt.Node;
     if (ProcNode<>nil) and (ANodeExt.ExtTxt3='')
     and (ProcNodeHasSpecifier(ProcNode,psOVERRIDE)) then begin
-      ProcCode:=ExtractProcHead(ProcNode,[phpWithStart,phpWithoutClassKeyword,
+      ProcCode:=ExtractProcHead(ProcNode,[phpWithStart,
                       phpAddClassname,phpWithVarModifiers,phpWithParameterNames,
                       phpWithResultType,phpWithCallingSpecs]);
       ProcCall:='inherited '+ExtractProcHead(ProcNode,[phpWithoutClassName,
@@ -2287,6 +2287,7 @@ var
       if (ANode<>nil) and (ANode.Desc=ctnProcedure)
       and ProcNodeHasSpecifier(ANode,psABSTRACT) then begin
         ClassProcs.Delete(AnAVLNode);
+        ANodeExt.Free;
       end;
       AnAVLNode:=NextAVLNode;
     end;
diff --git a/components/codetools/methodjumptool.pas b/components/codetools/methodjumptool.pas
index 63152662ca..94d64a3cdc 100644
--- a/components/codetools/methodjumptool.pas
+++ b/components/codetools/methodjumptool.pas
@@ -754,6 +754,7 @@ end;
 
 function TMethodJumpingCodeTool.GatherProcNodes(StartNode: TCodeTreeNode;
   Attr: TProcHeadAttributes; const UpperClassName: string): TAVLTree;
+// create a tree of TCodeTreeNodeExtension
 var CurProcName: string;
   ANode: TCodeTreeNode;
   NewNodeExt: TCodeTreeNodeExtension;
diff --git a/lcl/include/wincontrol.inc b/lcl/include/wincontrol.inc
index 093b26241d..7d5ddbd916 100644
--- a/lcl/include/wincontrol.inc
+++ b/lcl/include/wincontrol.inc
@@ -4780,10 +4780,11 @@ var
   NewWidth, NewHeight: integer;
 begin
   {$IFDEF VerboseSizeMsg}
-  DebugLn('TWinControl.WMMove A ',Name,':',ClassName,' Message=',dbgs(Message.XPos),',',dbgs(Message.YPos),
-    ' BoundsRealized='+dbgs(FBoundsRealized.Left)+','+dbgs(FBoundsRealized.Top),
-      ','+dbgs(FBoundsRealized.Right-FBoundsRealized.Left),
-      'x'+dbgs(FBoundsRealized.Bottom-FBoundsRealized.Top));
+  DebugLn(['TWinControl.WMMove A ',DbgSName(Self),' Message=',Message.XPos,',',Message.YPos,
+    ' BoundsRealized=',FBoundsRealized.Left,',',FBoundsRealized.Top,
+    ' SourceIsInterface=',Message.MoveType=Move_SourceIsInterface,
+    ',',FBoundsRealized.Right-FBoundsRealized.Left,
+    'x',FBoundsRealized.Bottom-FBoundsRealized.Top]);
   {$ENDIF}
   NewWidth:=Width;
   NewHeight:=Height;