diff options
| author | Atsushi Eno <atsushieno@gmail.com> | 2010-04-15 09:16:21 +0400 |
|---|---|---|
| committer | Atsushi Eno <atsushieno@gmail.com> | 2010-04-15 09:16:21 +0400 |
| commit | 984e33e0d984d0876280426e46a06d7039a958c0 (patch) | |
| tree | 916a107532b74baf437daf6e743461443bd6ccab /mcs/class/System.Xaml/System.Windows.Markup/StaticExtension.cs | |
| parent | 4d6cd3fd489b60c68be0aa45361bc4dd104c8d3d (diff) | |
2010-04-15 Atsushi Enomoto <atsushi@ximian.com>
* ArrayExtension.cs
TrimSurroundingWhitespaceAttribute.cs
RuntimeNamePropertyAttribute.cs
TypeExtension.cs
MarkupExtensionReturnTypeAttribute.cs
DateTimeValueSerializer.cs
IValueSerializerContext.cs
RootNamespaceAttribute.cs
MarkupExtension.cs
Reference.cs
AmbientAttribute.cs
NameScopePropertyAttribute.cs
ValueSerializer.cs
DictionaryKeyPropertyAttribute.cs
WhitespaceSignificantCollectionAttribute.cs
ConstructorArgumentAttribute.cs
IUriContext.cs
INameScope.cs
StaticExtension.cs
IProvideValueTarget.cs
ValueSerializerAttribute.cs
IXamlTypeResolver.cs
ContentWrapperAttribute.cs
ContentPropertyAttribute.cs
DependsOnAttribute.cs
NullExtension.cs
UidPropertyAttribute.cs : several corcompare fixes.
svn path=/trunk/mcs/; revision=155470
Diffstat (limited to 'mcs/class/System.Xaml/System.Windows.Markup/StaticExtension.cs')
| -rwxr-xr-x | mcs/class/System.Xaml/System.Windows.Markup/StaticExtension.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mcs/class/System.Xaml/System.Windows.Markup/StaticExtension.cs b/mcs/class/System.Xaml/System.Windows.Markup/StaticExtension.cs index c3478a61141..24df4f5a169 100755 --- a/mcs/class/System.Xaml/System.Windows.Markup/StaticExtension.cs +++ b/mcs/class/System.Xaml/System.Windows.Markup/StaticExtension.cs @@ -30,6 +30,7 @@ namespace System.Windows.Markup { [MarkupExtensionReturnType (typeof (object))] [TypeConverter (typeof (StaticExtensionConverter))] + [System.Runtime.CompilerServices.TypeForwardedFrom (Consts.AssemblyPresentationFramework_3_5)] public class StaticExtension : MarkupExtension { public StaticExtension () @@ -41,7 +42,10 @@ namespace System.Windows.Markup Member = member; } + [ConstructorArgument ("member")] public string Member { get; set; } + + [DefaultValue (null)] public Type MemberType { get; set; } public override object ProvideValue (IServiceProvider serviceProvider) |