Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
Jo Shields
2015-04-07 09:35:12 +01:00
parent 283343f570
commit 3c1f479b9d
22469 changed files with 2931443 additions and 869343 deletions

View File

@ -35,11 +35,7 @@ namespace System.Web.UI.WebControls {
[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
public class ValidatedControlConverter
#if NET_2_0
: ControlIDConverter
#else
: StringConverter
#endif
{
#region Public Constructors
public ValidatedControlConverter() {
@ -79,9 +75,7 @@ namespace System.Web.UI.WebControls {
return base.GetStandardValues (context);
}
#if NET_2_0
protected override
#endif
bool FilterControl (Control control)
{
return BaseValidator.GetValidationProperty (control) != null;