From 48cf639fb8c890962fd6b5672190b0787976fd07 Mon Sep 17 00:00:00 2001
From: lazarus <lazarus@lazarus-ide.org>
Date: Sat, 17 Aug 2002 23:40:25 +0000
Subject: [PATCH] MG: fixed designer component deletion

git-svn-id: trunk@1962 -
---
 designer/designer.pp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/designer/designer.pp b/designer/designer.pp
index eea6d5928e..4f02f27d9a 100644
--- a/designer/designer.pp
+++ b/designer/designer.pp
@@ -264,6 +264,8 @@ Begin
   {$IFDEF VerboseDesigner}
   Writeln('[TDesigner.RemoveControl] C ',AComponent.Name,':',AComponent.ClassName);
   {$ENDIF}
+  if not (AComponent is TControl) then
+    Form.Invalidate;
   FFormEditor.DeleteControl(AComponent);
 end;
 
@@ -505,7 +507,7 @@ Begin
     MouseDownSender:=nil;
     exit;
   end;
-
+  
   ControlSelection.ActiveGrabber:=nil;
   RubberBandWasActive:=ControlSelection.RubberBandActive;
 
@@ -544,17 +546,17 @@ Begin
            and (ControlSelection[0].Component is TCustomForm)) then
             ControlSelection.Clear;
           ControlSelection.SelectWithRubberBand(
-            SenderParentForm,ssShift in Shift);
+            Form,ssShift in Shift);
           if ControlSelection.Count=0 then
-            ControlSelection.Add(SenderParentForm);
+            ControlSelection.Add(Form);
           ControlSelection.RubberbandActive:=false;
         end else begin
           if (not (ssShift in Shift)) then begin
             ControlSelection.Clear;
-            ControlSelection.Add(Sender);
+            ControlSelection.Add(MouseDownComponent);
           end;
         end;
-        SenderParentForm.Invalidate;
+        Form.Invalidate;
       end;
       ControlSelection.EndUpdate;
     end else begin
@@ -563,7 +565,7 @@ Begin
       ControlSelection.BeginUpdate;
 
       // find a parent for the new component
-      NewParent:=TWinControl(Sender);
+      NewParent:=TWinControl(MouseDownComponent);
       while (NewParent<>nil)
       and ((not (csAcceptsControls in NewParent.ControlStyle))
         or ((NewParent.Owner<>Form) and (NewParent<>Form)))