Author: jackson
Date: 2007-08-27 20:05:21 -0400 (Mon, 27 Aug 2007)
New Revision: 84928

Modified:
   trunk/moon/src/ChangeLog
   trunk/moon/src/dependencyobject.cpp
   trunk/moon/src/dependencyobject.h
Log:

        * dependencyobject.cpp|h: Don't return Collections when getting
        parents.



Modified: trunk/moon/src/ChangeLog
===================================================================
--- trunk/moon/src/ChangeLog    2007-08-27 23:55:31 UTC (rev 84927)
+++ trunk/moon/src/ChangeLog    2007-08-28 00:05:21 UTC (rev 84928)
@@ -1,3 +1,8 @@
+2007-08-27  Jackson Harper  <[EMAIL PROTECTED]>
+
+       * dependencyobject.cpp|h: Don't return Collections when getting
+       parents.
+
 2007-08-27  Jeffrey Stedfast  <[EMAIL PROTECTED]>
 
        * mplayer.cpp (Play): Always add a timeout, even for audio-only

Modified: trunk/moon/src/dependencyobject.cpp
===================================================================
--- trunk/moon/src/dependencyobject.cpp 2007-08-27 23:55:31 UTC (rev 84927)
+++ trunk/moon/src/dependencyobject.cpp 2007-08-28 00:05:21 UTC (rev 84928)
@@ -564,6 +564,15 @@
        this->parent = parent;
 }
 
+DependencyObject*
+DependencyObject::GetParent ()
+{
+       DependencyObject *res = parent;
+       while (res && Type::Find (res->GetObjectType ())->IsSubclassOf 
(Type::COLLECTION))
+               res = res->GetParent ();
+       return res;
+}
+
 void
 DependencyObject::NotifyParentOfPropertyChange (DependencyProperty *property, 
bool only_exact_type)
 {

Modified: trunk/moon/src/dependencyobject.h
===================================================================
--- trunk/moon/src/dependencyobject.h   2007-08-27 23:55:31 UTC (rev 84927)
+++ trunk/moon/src/dependencyobject.h   2007-08-28 00:05:21 UTC (rev 84928)
@@ -121,7 +121,7 @@
        }
        
        void SetParent (DependencyObject *parent);
-       DependencyObject* GetParent () { return parent; }
+       DependencyObject* GetParent ();
 
        //
        // Is:

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to