mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 4.0.0~alpha1

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

45
mcs/class/System.Web/System.Web.UI.WebControls/TableStyle.cs
View File

@ -58,12 +58,8 @@ namespace System.Web.UI.WebControls {
}
#if NET_2_0
[NotifyParentProperty (true)]
[UrlProperty]
#else
[Bindable (true)]
#endif
[DefaultValue ("")]
[WebSysDescription ("")]
[WebCategory ("Appearance")]
@ -81,11 +77,7 @@ namespace System.Web.UI.WebControls {
}
}
#if NET_2_0
[NotifyParentProperty (true)]
#else
[Bindable (true)]
#endif
[DefaultValue (-1)]
[WebSysDescription ("")]
[WebCategory ("Appearance")]
@ -103,11 +95,7 @@ namespace System.Web.UI.WebControls {
}
}
#if NET_2_0
[NotifyParentProperty (true)]
#else
[Bindable (true)]
#endif
[DefaultValue (-1)]
[WebSysDescription ("")]
[WebCategory ("Appearance")]
@ -126,11 +114,7 @@ namespace System.Web.UI.WebControls {
}
// LAMESPEC: default is documented to be Both
#if NET_2_0
[NotifyParentProperty (true)]
#else
[Bindable (true)]
#endif
[DefaultValue (GridLines.None)]
[WebSysDescription ("")]
[WebCategory ("Appearance")]
@ -151,11 +135,7 @@ namespace System.Web.UI.WebControls {
}
}
#if NET_2_0
[NotifyParentProperty (true)]
#else
[Bindable (true)]
#endif
[DefaultValue (HorizontalAlign.NotSet)]
[WebSysDescription ("")]
[WebCategory ("Layout")]
@ -175,9 +155,7 @@ namespace System.Web.UI.WebControls {
SetBit ((int) TableStyles.HorizontalAlign);
}
}
#if NET_4_0
[MonoTODO ("collapse style should be rendered only for browsers which support that.")]
#endif
public override void AddAttributesToRender (HtmlTextWriter writer, WebControl owner)
{
base.AddAttributesToRender (writer, owner);
@ -224,29 +202,8 @@ namespace System.Web.UI.WebControls {
writer.AddAttribute (HtmlTextWriterAttribute.Align, "justify", false);
break;
}
#if NET_4_0
if (g != GridLines.None && BorderWidth.IsEmpty)
writer.AddAttribute (HtmlTextWriterAttribute.Border, "1", false);
#else
// border (=0) is always present (and base class doesn't seems to add it)
// but border is "promoted" to 1 if gridlines are present (with BorderWidth == 0)
if (g == GridLines.None) {
writer.AddAttribute (HtmlTextWriterAttribute.Border, "0", false);
} else if (BorderWidth.IsEmpty) {
writer.AddAttribute (HtmlTextWriterAttribute.Border, "1", false);
} else {
writer.AddAttribute (HtmlTextWriterAttribute.Border, BorderWidth.Value.ToString (Helpers.InvariantCulture));
}
#endif
#if !NET_2_0
string s = BackImageUrl;
if (s.Length > 0) {
if (owner != null)
s = owner.ResolveClientUrl (s);
s = String.Concat ("url(", s, ")");
writer.AddStyleAttribute (HtmlTextWriterStyle.BackgroundImage, s);
}
#endif
}
void Copy (string name, TableStyles s, Style source)
@ -316,7 +273,6 @@ namespace System.Web.UI.WebControls {
// call base at the end because "styles" will reset there
base.Reset ();
}
#if NET_2_0
protected override void FillStyleAttributes (CssStyleCollection attributes, IUrlResolutionService urlResolver)
{
if (attributes != null) {
@ -329,7 +285,6 @@ namespace System.Web.UI.WebControls {
}
base.FillStyleAttributes (attributes, urlResolver);
}
#endif
}
}