* reverted compon.inc to the state of r13298 (csFreeNotification maybe set even with no freelist allocated)

git-svn-id: trunk@13917 -

rtl/objpas/classes/compon.inc

@@ -18,32 +18,38 @@
 Function  TComponent.GetComponent(AIndex: Integer): TComponent;
 
 begin
-  If assigned(FComponents) then
-    Result:=TComponent(FComponents.Items[Aindex])
+  If not assigned(FComponents) then
+    Result:=Nil
   else
-    Result:=Nil;
+    Result:=TComponent(FComponents.Items[Aindex]);
 end;
 
 function TComponent.IsImplementorOf (const Intf:IInterface):boolean;
 var ref : IInterfaceComponentReference;
 begin
- result:=assigned(intf) and supports(intf,IInterfaceComponentReference,ref) and (ref.getcomponent=self);
+ result:=assigned(intf) and supports(intf,IInterfaceComponentReference,ref);
+ if result then
+   result:=ref.getcomponent=self;
 end;
 
 procedure TComponent.ReferenceInterface(const intf:IInterface;op:TOperation);
 var ref : IInterfaceComponentReference;
+    comp : TComponent;
 begin
  if assigned(intf) and supports(intf,IInterfaceComponentReference,ref) then
-    ref.getcomponent.notification(self,op);
+   begin
+    comp:=ref.getcomponent;
+    comp.notification(self,op); 
+   end;
 end;
 
 Function  TComponent.GetComponentCount: Integer;
 
 begin
-  If assigned(FComponents) then
-    Result:=FComponents.Count
-  else
+  If not assigned(FComponents) then
     result:=0
+  else
+    Result:=FComponents.Count;
 end;
 
 
@@ -51,7 +57,7 @@ Function  TComponent.GetComponentIndex: Integer;
 
 begin
   If Assigned(FOwner) and Assigned(FOwner.FComponents) then
-    Result:=FOwner.FComponents.IndexOf(Self)
+    Result:=FOWner.FComponents.IndexOf(Self)
   else
     Result:=-1;
 end;
@@ -85,7 +91,7 @@ Procedure TComponent.Remove(AComponent: TComponent);
 
 begin
   AComponent.FOwner:=Nil;
-  If assigned(FComponents) then
+  If assigned(FCOmponents) then
     begin
     FComponents.Remove(AComponent);
     IF FComponents.Count=0 then
@@ -107,7 +113,7 @@ begin
       begin
       FFreeNotifies.Free;
       FFreeNotifies:=nil;
-      Exclude(FComponentState, csFreeNotification);
+      Exclude(FComponentState,csFreeNotification);
       end;
     end;
 end;
@@ -118,7 +124,7 @@ Procedure TComponent.SetComponentIndex(Value: Integer);
 Var Temp,Count : longint;
 
 begin
-  If Not assigned(FOwner) then exit;
+  If Not assigned(Fowner) then exit;
   Temp:=getcomponentindex;
   If temp<0 then exit;
   If value<0 then value:=0;
@@ -224,13 +230,13 @@ end;
 Procedure TComponent.Loaded;
 
 begin
-  Exclude(FComponentState, csLoading);
+  Exclude(FComponentState,csLoading);
 end;
 
 Procedure TComponent.Loading;
 
 begin
-  Include(FComponentState, csLoading);
+  Include(FComponentState,csLoading);
 end;
 
 
@@ -243,11 +249,10 @@ begin
   If (Operation=opRemove) and Assigned(FFreeNotifies) then
     begin
     FFreeNotifies.Remove(AComponent);
-    If FFreeNotifies.Count=0 then
+            If FFreeNotifies.Count=0 then
       begin
       FFreeNotifies.Free;
       FFreenotifies:=Nil;
-      Exclude(FComponentState, csFreeNotification);
       end;
     end;
   If assigned(FComponents) then
@@ -274,9 +279,9 @@ Var Runner : Longint;
 
 begin
   If Value then
-    Include(FComponentState, csAncestor)
+    Include(FComponentState,csAncestor)
   else
-    Exclude(FComponentState, csAncestor);
+    Exclude(FCOmponentState,csAncestor);
   if Assigned(FComponents) then
     For Runner:=0 To FComponents.Count-1 do
       TComponent(FComponents.Items[Runner]).SetAncestor(Value);
@@ -289,9 +294,9 @@ Var Runner : Longint;
 
 begin
   If Value then
-    Include(FComponentState, csDesigning)
+    Include(FComponentState,csDesigning)
   else
-    Exclude(FComponentState, csDesigning);
+    Exclude(FComponentState,csDesigning);
   if Assigned(FComponents) and SetChildren then
     For Runner:=0 To FComponents.Count - 1 do
       TComponent(FComponents.items[Runner]).SetDesigning(Value);
@@ -301,18 +306,18 @@ Procedure TComponent.SetDesignInstance(Value: Boolean);
 
 begin
   If Value then
-    Include(FComponentState, csDesignInstance)
+    Include(FComponentState,csDesignInstance)
   else
-    Exclude(FComponentState, csDesignInstance);
+    Exclude(FComponentState,csDesignInstance);
 end;
 
 Procedure TComponent.SetInline(Value: Boolean);
 
 begin
   If Value then
-    Include(FComponentState, csInline)
+    Include(FComponentState,csInline)
   else
-    Exclude(FComponentState, csInline);
+    Exclude(FComponentState,csInline);
 end;
 
 
@@ -349,14 +354,14 @@ end;
 Procedure TComponent.Updating;
 
 begin
-  Include(FComponentState, csUpdating);
+  Include (FComponentState,csUpdating);
 end;
 
 
 Procedure TComponent.Updated;
 
 begin
-  Exclude(FComponentState, csUpdating);
+  Exclude(FComponentState,csUpdating);
 end;
 
 
@@ -409,27 +414,30 @@ begin
 end;
 
 
-Procedure TComponent.BeforeDestruction;
-
-begin
-  Destroying;
-  inherited BeforeDestruction;
-end;
-
-
 Destructor TComponent.Destroy;
 
 Var
   I : Integer;
-  L : TList;
+  C : TComponent;
+
 begin
+  Destroying;
   If Assigned(FFreeNotifies) then
     begin
-    L := FFreeNotifies;
-    FFreenotifies:=Nil;
-    for I := L.Count - 1 downto 0 do
-      TComponent(L.Items[I]).Notification(self,opRemove);
-    L.Free;
+    I:=FFreeNotifies.Count-1;
+    While (I>=0) do
+      begin
+      C:=TComponent(FFreeNotifies.Items[I]);
+      // Delete, so one component is not notified twice, if it is owned.
+      FFreeNotifies.Delete(I);
+      C.Notification (self,opRemove);
+      If (FFreeNotifies=Nil) then
+        I:=0
+      else if (I>FFreeNotifies.Count) then
+        I:=FFreeNotifies.Count;
+      dec(i);
+      end;
+    FreeAndNil(FFreeNotifies);
     end;
   DestroyComponents;
   If FOwner<>Nil Then FOwner.RemoveComponent(Self);
@@ -437,6 +445,13 @@ begin
 end;
 
 
+Procedure TComponent.BeforeDestruction;
+begin
+  if not(csDestroying in FComponentstate) then
+    Destroying;
+end;
+
+
 Procedure TComponent.DestroyComponents;
 
 Var acomponent: TComponent;
@@ -457,7 +472,7 @@ Var Runner : longint;
 
 begin
   If csDestroying in FComponentstate Then Exit;
-  Include(FComponentState, csDestroying);
+  include (FComponentState,csDestroying);
   If Assigned(FComponents) then
     for Runner:=0 to FComponents.Count-1 do
       TComponent(FComponents.Items[Runner]).Destroying;
@@ -500,11 +515,8 @@ begin
     AComponent.Notification(Self,opRemove)
   else
     begin
-    If not Assigned(FFreeNotifies) then
-      begin
-        FFreeNotifies:=TList.Create;
-        Include(FComponentState, csFreeNotification);
-      end;
+    If not (Assigned(FFreeNotifies)) then
+      FFreeNotifies:=TList.Create;
     If FFreeNotifies.IndexOf(AComponent)=-1 then
       begin
       FFreeNotifies.Add(AComponent);