Author: toshok
Date: 2007-10-17 13:16:59 -0400 (Wed, 17 Oct 2007)
New Revision: 87703
Modified:
trunk/moon/src/ChangeLog
trunk/moon/src/xaml.cpp
Log:
2007-10-17 Chris Toshok <[EMAIL PROTECTED]>
* xaml.cpp (XNamespace::SetAttribute): make sure to add the newly
created managed dob to the created_elements list so it gets
unrefed properly.
(XamlLoader::XamlLoader): use ->ref() instead of base_ref().
(XamlLoader::~XamlLoader): use ->unref() instead of base_unref().
Modified: trunk/moon/src/ChangeLog
===================================================================
--- trunk/moon/src/ChangeLog 2007-10-17 17:15:07 UTC (rev 87702)
+++ trunk/moon/src/ChangeLog 2007-10-17 17:16:59 UTC (rev 87703)
@@ -1,5 +1,13 @@
2007-10-17 Chris Toshok <[EMAIL PROTECTED]>
+ * xaml.cpp (XNamespace::SetAttribute): make sure to add the newly
+ created managed dob to the created_elements list so it gets
+ unrefed properly.
+ (XamlLoader::XamlLoader): use ->ref() instead of base_ref().
+ (XamlLoader::~XamlLoader): use ->unref() instead of base_unref().
+
+2007-10-17 Chris Toshok <[EMAIL PROTECTED]>
+
* Makefile.am (demo_LDADD): add MOON_PROG_LIBS.
(sizes_LDADD): same.
Modified: trunk/moon/src/xaml.cpp
===================================================================
--- trunk/moon/src/xaml.cpp 2007-10-17 17:15:07 UTC (rev 87702)
+++ trunk/moon/src/xaml.cpp 2007-10-17 17:16:59 UTC (rev 87703)
@@ -287,7 +287,7 @@
if (!strcmp ("Class", attr)) {
DependencyObject *old = item->item;
-
+
item->item = NULL;
DependencyObject *dob = NULL;
if (p->loader) {
@@ -308,6 +308,8 @@
NameScope::SetNameScope (dob, ns);
item->item = dob;
+ p->AddCreatedElement (item->item);
+
*reparse = true;
return;
}
@@ -537,7 +539,7 @@
this->filename = g_strdup (filename);
this->str = g_strdup (str);
this->surface = surface;
- base_ref (this->surface);
+ surface->ref ();
this->missing_assemblies = NULL;
this->mappings = NULL;
this->vm_loaded = false;
@@ -551,7 +553,7 @@
{
g_free (filename);
g_free (str);
- base_unref (this->surface);
+ surface->unref ();
if (missing_assemblies)
g_hash_table_destroy (missing_assemblies);
if (mappings)
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
