From b950207508d8c1b0b9bb18c606767f8913e573be Mon Sep 17 00:00:00 2001
From: florian <florian@freepascal.org>
Date: Sat, 7 Aug 2004 16:44:34 +0000
Subject: [PATCH]   * tcomponent.destroying is now called in
 tcomponent.beforedestruction

---
 rtl/objpas/classes/compon.inc | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/rtl/objpas/classes/compon.inc b/rtl/objpas/classes/compon.inc
index 2b043086aa..73033a9032 100644
--- a/rtl/objpas/classes/compon.inc
+++ b/rtl/objpas/classes/compon.inc
@@ -377,6 +377,7 @@ Destructor TComponent.Destroy;
 Var Runner : Longint;
 
 begin
+  Destroying;
   If Assigned(FFreeNotifies) then
     begin
     For Runner:=0 To FFreeNotifies.Count-1 do
@@ -384,13 +385,19 @@ begin
     FFreeNotifies.Free;
     FFreeNotifies:=Nil;
     end;
-  Destroying;
   DestroyComponents;
   If FOwner<>Nil Then FOwner.RemoveComponent(Self);
   inherited destroy;
 end;
 
 
+Procedure TComponent.BeforeDestruction;
+begin
+  if not(csDestroying in FComponentstate) then
+    Destroying;
+end;
+
+
 Procedure TComponent.DestroyComponents;
 
 Var acomponent: TComponent;
@@ -533,7 +540,10 @@ end;
 
 {
   $Log$
-  Revision 1.2  2004-01-12 17:44:22  peter
+  Revision 1.3  2004-08-07 16:44:35  florian
+    * tcomponent.destroying is now called in tcomponent.beforedestruction
+
+  Revision 1.2  2004/01/12 17:44:22  peter
     * LongRec is a packed record
 
   Revision 1.1  2003/10/06 21:01:06  peter
@@ -554,4 +564,4 @@ end;
   Revision 1.5  2002/01/06 21:54:50  peter
     * action classes added
 
-}
+}
\ No newline at end of file