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

@ -54,9 +54,6 @@ namespace System.Web.UI.WebControls {
{
}
#if ONLY_1_1
[Bindable (true)]
#endif
[DefaultValue (HorizontalAlign.NotSet)]
[NotifyParentProperty (true)]
[WebSysDescription ("")]
@ -78,9 +75,6 @@ namespace System.Web.UI.WebControls {
}
}
#if ONLY_1_1
[Bindable (true)]
#endif
[DefaultValue (VerticalAlign.NotSet)]
[NotifyParentProperty (true)]
[WebSysDescription ("")]
@ -102,9 +96,6 @@ namespace System.Web.UI.WebControls {
}
}
#if ONLY_1_1
[Bindable (true)]
#endif
[DefaultValue (true)]
[NotifyParentProperty (true)]
[WebSysDescription ("")]
@ -158,11 +149,7 @@ namespace System.Web.UI.WebControls {
}
if (!Wrap) {
#if NET_2_0
writer.AddStyleAttribute (HtmlTextWriterStyle.WhiteSpace, "nowrap");
#else
writer.AddAttribute (HtmlTextWriterAttribute.Nowrap, "nowrap");
#endif
}
}