Changeset 8642 for trunk/MagicSoft/Mars/mbase/MParContainer.cc

Timestamp:

07/18/07 20:30:13 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mbase/MParContainer.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/mbase/MParContainer.cc

@@ -71 +71 @@
 #include "MLogManip.h"
 
+#include "MStatusDisplay.h"
+
 TList *gListOfPrimitives; // forard declaration in MParContainer.h
 
@@ -116 +118 @@
         return;
 
-    *fLog << all << "Deleting " << GetDescriptor() << endl;
+    *fLog << all << "Deleting " << this << " " << GetDescriptor() << endl;
     if (TestBit(kMustCleanup) && gROOT && gROOT->MustClean())
     {
@@ -921 +923 @@
     return ((TEnv&)env).GetValue(prefix, dflt);
 }
+
+// --------------------------------------------------------------------------
+//
+// If object to remove is fDisplay set fDisplay to NULL.
+// If object to remove is fLog     set fLog     to NULL.
+// Call TObject::RecursiveRemove
+//
+void MParContainer::RecursiveRemove(TObject *obj)
+{
+    if (obj==fDisplay)
+        fDisplay=NULL;
+
+    if (obj==fLog)
+        fLog=NULL;
+
+    if (fDisplay)
+        fDisplay->RecursiveRemove(obj);
+
+    if (fLog)
+        fLog->RecursiveRemove(obj);
+
+    TObject::RecursiveRemove(obj);
+}
+