Author: jackson
Date: 2007-11-20 11:55:19 -0500 (Tue, 20 Nov 2007)
New Revision: 89993

Modified:
   trunk/moon/src/ChangeLog
   trunk/moon/src/xaml.cpp
Log:

                * xaml.cpp: If we need to reparse the attributes for an
                * element
        (because we loaded a class and the props need to be set on the
new
        class) we have to clear out the hash of properties that are
marked
        as already set. Otherwise we get a property already set error.



Modified: trunk/moon/src/ChangeLog
===================================================================
--- trunk/moon/src/ChangeLog    2007-11-20 16:30:25 UTC (rev 89992)
+++ trunk/moon/src/ChangeLog    2007-11-20 16:55:19 UTC (rev 89993)
@@ -1,5 +1,12 @@
 2007-11-20  Jackson Harper  <[EMAIL PROTECTED]>
 
+       * xaml.cpp: If we need to reparse the attributes for an element
+       (because we loaded a class and the props need to be set on the new
+       class) we have to clear out the hash of properties that are marked
+       as already set. Otherwise we get a property already set error.
+
+2007-11-20  Jackson Harper  <[EMAIL PROTECTED]>
+
        * xaml.cpp: Add new function to create a value from a string
        without having the Kind available (you still need to have the type
        in string form).

Modified: trunk/moon/src/xaml.cpp
===================================================================
--- trunk/moon/src/xaml.cpp     2007-11-20 16:30:25 UTC (rev 89992)
+++ trunk/moon/src/xaml.cpp     2007-11-20 16:55:19 UTC (rev 89993)
@@ -125,6 +125,11 @@
 
                g_hash_table_insert (set_properties, name, GINT_TO_POINTER 
(TRUE));
        }
+
+       void ClearSetProperties ()
+       {
+               g_hash_table_remove_all (set_properties);
+       }
 };
 
 void 
@@ -2823,6 +2828,7 @@
                        if (reparse) {
                                skip_attribute = i;
                                i = 0;
+                               item->ClearSetProperties ();
                                goto start_parse;
                        }
                        continue;

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

Reply via email to