Changeset 8484 for trunk/MagicSoft/Mars/mbase/MStatusArray.cc

Timestamp:

05/10/07 13:16:56 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mbase/MStatusArray.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mbase/MStatusArray.cc

@@ -93 +93 @@
 TObject *MStatusArray::FindObjectInPad(TVirtualPad *pad, const char *object, TClass *cls) const
 {
-    TObject *o = pad->FindObject(object);
-    if (o && o->InheritsFrom(cls))
-        return o;
+    TObject *o = NULL;//pad->FindObject(object);
+//    if (o && o->InheritsFrom(cls))
+//        return o;
 
     TIter Next(pad->GetListOfPrimitives());
     while ((o=Next()))
     {
+        if (o->GetName()==(TString)object && o->InheritsFrom(cls))
+            return o;
+
         if (o==pad || !o->InheritsFrom(TVirtualPad::Class()))
             continue;
 
         if ((o = FindObjectInPad((TVirtualPad*)o, object, cls)))
-            if (o->InheritsFrom(cls))
-                return o;
+            return o;
+//            if (o->InheritsFrom(cls))
+//                return o;
     }
     return 0;