diff options
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( |