Permalink
Browse files

Revert "put these back.."

This reverts commit 3e2a9d0.
We can't ifdef out the 'override' in the method declaration as it
breaks the desktop build and makes desktop moonlight completely
unusable. If we don't override these methods we will never invoke
them and will never be able to parse the generic.xaml. Declaring
the methods as 'new' is completely useless.
  • Loading branch information...
1 parent a4f99c2 commit 9ff785366dc161ed1a9048231b0fa4d575edd64c @alanmcgovern alanmcgovern committed May 23, 2011
View
14 class/System.Windows/System.Windows/DurationConverter.cs
@@ -39,22 +39,12 @@ public DurationConverter ()
{
}
-#if NET_2_1
- override
-#else
- new
-#endif
- public bool CanConvertFrom (ITypeDescriptorContext context, Type sourceType)
+ public override bool CanConvertFrom (ITypeDescriptorContext context, Type sourceType)
{
return TypeConverters.CanConvertFrom<Duration>(sourceType);
}
-#if NET_2_1
- override
-#else
- new
-#endif
- public object ConvertFrom (ITypeDescriptorContext context, CultureInfo culture, object value)
+ public override object ConvertFrom (ITypeDescriptorContext context, CultureInfo culture, object value)
{
if (value is string) {
string text = (string) value;
View
14 class/System.Windows/System.Windows/PropertyPathConverter.cs
@@ -39,22 +39,12 @@ public PropertyPathConverter ()
{
}
-#if NET_2_1
- override
-#else
- new
-#endif
- public bool CanConvertFrom (ITypeDescriptorContext context, Type sourceType)
+ public override bool CanConvertFrom (ITypeDescriptorContext context, Type sourceType)
{
return TypeConverters.CanConvertFrom<PropertyPath>(sourceType);
}
-#if NET_2_1
- override
-#else
- new
-#endif
- public object ConvertFrom (ITypeDescriptorContext context, CultureInfo culture, object value)
+ public override object ConvertFrom (ITypeDescriptorContext context, CultureInfo culture, object value)
{
string str_val = value as string;
if (str_val != null)

0 comments on commit 9ff7853

Please sign in to comment.