Author: jackson
Date: 2007-07-12 15:16:57 -0400 (Thu, 12 Jul 2007)
New Revision: 81892
Modified:
trunk/moon/src/ChangeLog
trunk/moon/src/collection.cpp
Log:
* collection.cpp: Comment out the namescope merging
* stuff for now,
it causes some regressions.
Modified: trunk/moon/src/ChangeLog
===================================================================
--- trunk/moon/src/ChangeLog 2007-07-12 18:51:46 UTC (rev 81891)
+++ trunk/moon/src/ChangeLog 2007-07-12 19:16:57 UTC (rev 81892)
@@ -1,3 +1,8 @@
+2007-07-11 Jackson Harper <[EMAIL PROTECTED]>
+
+ * collection.cpp: Comment out the namescope merging stuff for now,
+ it causes some regressions.
+
2007-07-12 Jackson Harper <[EMAIL PROTECTED]>
* xaml.cpp: Restart the whole attribute parsing loop when the
Modified: trunk/moon/src/collection.cpp
===================================================================
--- trunk/moon/src/collection.cpp 2007-07-12 18:51:46 UTC (rev 81891)
+++ trunk/moon/src/collection.cpp 2007-07-12 19:16:57 UTC (rev 81892)
@@ -64,14 +64,14 @@
generation++;
list->Append (new Collection::Node (data, this));
data->Attach (NULL, this);
-
+/*
NameScope *ns = data->FindNameScope ();
NameScope *con_ns = ((DependencyObject *) closure)->FindNameScope ();
if (ns && con_ns && ns != con_ns) {
con_ns->MergeTemporaryScope (ns);
NameScope::SetNameScope (data, con_ns);
}
-
+*/
if (closure)
closure->OnCollectionChanged (this,
CollectionChangeTypeItemAdded, data, NULL);
}
@@ -85,14 +85,14 @@
list->Insert (new Collection::Node (data, this), index);
data->Attach (NULL, this);
-
+/*
NameScope *ns = data->FindNameScope ();
NameScope *con_ns = ((DependencyObject *) closure)->FindNameScope ();
if (ns && con_ns && ns != con_ns) {
con_ns->MergeTemporaryScope (ns);
NameScope::SetNameScope (data, con_ns);
}
-
+*/
if (closure)
closure->OnCollectionChanged (this,
CollectionChangeTypeItemAdded, data, NULL);
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
