diff options
| author | Iain McCoy <iainmc@mono-cvs.ximian.com> | 2005-07-14 20:38:43 +0400 |
|---|---|---|
| committer | Iain McCoy <iainmc@mono-cvs.ximian.com> | 2005-07-14 20:38:43 +0400 |
| commit | c6e26321fa64f1b15e4f2d561079968d3452f7b3 (patch) | |
| tree | 874e37ab8427412bc94ea6a76ef50a449ec6cd91 /mcs/class/PresentationFramework | |
| parent | 32d2f2d1bddfe6e7b3c3ff4141b77aeef2256020 (diff) | |
2005-07-15 Iain McCoy <iain@mccoy.id.au>
* Mono.Windows.Serialization/CodeWriter.cs: don't try to convert
objects into their parent types.
* demo/TestVocab/ConsoleValues.cs: Add ConsoleValueAppend to avoid
resolving read value too early
* demo/TestVocab/ConsoleWriter.cs: Use ConsoleValue as type of Text
property. These changes get the example working
svn path=/trunk/mcs/; revision=47310
Diffstat (limited to 'mcs/class/PresentationFramework')
| -rw-r--r-- | mcs/class/PresentationFramework/ChangeLog | 5 | ||||
| -rw-r--r-- | mcs/class/PresentationFramework/Mono.Windows.Serialization/CodeWriter.cs | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/mcs/class/PresentationFramework/ChangeLog b/mcs/class/PresentationFramework/ChangeLog index 811d9a4a5d2..35d15bee2e2 100644 --- a/mcs/class/PresentationFramework/ChangeLog +++ b/mcs/class/PresentationFramework/ChangeLog @@ -1,5 +1,10 @@ 2005-07-15 Iain McCoy <iain@mccoy.id.au> + * Mono.Windows.Serialization/CodeWriter.cs: don't try to convert + objects into their parent types. + +2005-07-15 Iain McCoy <iain@mccoy.id.au> + * Mono.Windows.Serialization/CodeWriter.cs: Better debugging information * Mono.Windows.Serialization/XamlParser.cs: Better debugging diff --git a/mcs/class/PresentationFramework/Mono.Windows.Serialization/CodeWriter.cs b/mcs/class/PresentationFramework/Mono.Windows.Serialization/CodeWriter.cs index 00ab7bd0bcf..bf5fc697676 100644 --- a/mcs/class/PresentationFramework/Mono.Windows.Serialization/CodeWriter.cs +++ b/mcs/class/PresentationFramework/Mono.Windows.Serialization/CodeWriter.cs @@ -325,7 +325,7 @@ namespace Mono.Windows.Serialization { CodeExpression expr; - if (destType == sourceType) + if (sourceType == destType || sourceType.IsSubclassOf(destType)) expr = varRef; else expr = new CodeCastExpression( |