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

@ -147,11 +147,9 @@ namespace System.Web.UI.WebControls
}
set { ViewState ["GenerateEmptyAlternateText"] = value; }
}
#if NET_4_0
public override bool SupportsDisabledAttribute {
get { return RenderingCompatibilityLessThan40; }
}
#endif
protected override void AddAttributesToRender (HtmlTextWriter writer)
{
base.AddAttributesToRender (writer);
@ -195,10 +193,6 @@ namespace System.Web.UI.WebControls
}
#if BUG_78875_FIXED
if (Context.Request.Browser.SupportsCss)
#endif
#if !NET_4_0
if (BorderWidth.IsEmpty)
writer.AddStyleAttribute (HtmlTextWriterStyle.BorderWidth, "0px");
#endif
}