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

17
mcs/class/System.Web/System.Web.UI.WebControls/Panel.cs
View File

@ -54,13 +54,9 @@ namespace System.Web.UI.WebControls {
string image = BackImageUrl;
if (image != "") {
image = ResolveClientUrl (image);
#if !NET_2_0 // see HtmlTextWriter.WriteStyleAttribute(string, string, bool)
image = String.Concat ("url(", image, ")");
#endif
w.AddStyleAttribute (HtmlTextWriterStyle.BackgroundImage, image);
}
#if NET_2_0
if (!String.IsNullOrEmpty (DefaultButton) && Page != null) {
Control button = FindControl (DefaultButton);
if (button == null || !(button is IButtonControl))
@ -91,14 +87,9 @@ namespace System.Web.UI.WebControls {
break;
}
#endif
if (!Wrap) {
#if NET_2_0
w.AddStyleAttribute (HtmlTextWriterStyle.WhiteSpace, "nowrap");
#else
w.AddAttribute (HtmlTextWriterAttribute.Nowrap, "nowrap");
#endif
}
string align = "";
@ -111,13 +102,8 @@ namespace System.Web.UI.WebControls {
}
if (align != "")
#if NET_2_0
w.AddStyleAttribute (HtmlTextWriterStyle.TextAlign, align);
#else
w.AddAttribute (HtmlTextWriterAttribute.Align, align);
#endif
}
#if NET_2_0
PanelStyle PanelStyle {
get { return (ControlStyle as PanelStyle); }
}
@ -246,11 +232,9 @@ namespace System.Web.UI.WebControls {
ViewState ["ScrollBars"] = value;
}
}
#if NET_4_0
public override bool SupportsDisabledAttribute {
get { return RenderingCompatibilityLessThan40; }
}
#endif
protected override Style CreateControlStyle ()
{
return new PanelStyle (ViewState);
@ -274,6 +258,5 @@ namespace System.Web.UI.WebControls {
}
base.RenderEndTag (writer);
}
#endif
}
}