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

Imported Upstream version 5.2.0.175

Browse Source 
Former-commit-id: bb0468d0f257ff100aa895eb5fe583fb5dfbf900
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-06-07 13:16:24 +00:00
parent 4bdbaf4a88
commit 966bba02bb
8776 changed files with 346420 additions and 149650 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,14 +47,14 @@ namespace System.Web.UI.WebControls {
{
}
protected override void AddAttributesToRender (HtmlTextWriter w)
protected override void AddAttributesToRender (HtmlTextWriter writer)
{
base.AddAttributesToRender (w);
base.AddAttributesToRender (writer);
string image = BackImageUrl;
if (image != "") {
image = ResolveClientUrl (image);
w.AddStyleAttribute (HtmlTextWriterStyle.BackgroundImage, image);
writer.AddStyleAttribute (HtmlTextWriterStyle.BackgroundImage, image);
}
if (!String.IsNullOrEmpty (DefaultButton) && Page != null) {
@ -64,32 +64,32 @@ namespace System.Web.UI.WebControls {
Page.ClientScript.RegisterWebFormClientScript ();
w.AddAttribute ("onkeypress",
writer.AddAttribute ("onkeypress",
"javascript:return " + Page.WebFormScriptReference + ".WebForm_FireDefaultButton(event, '" + button.ClientID + "')");
}
if (Direction != ContentDirection.NotSet) {
w.AddAttribute (HtmlTextWriterAttribute.Dir, Direction == ContentDirection.RightToLeft ? "rtl" : "ltr", false);
writer.AddAttribute (HtmlTextWriterAttribute.Dir, Direction == ContentDirection.RightToLeft ? "rtl" : "ltr", false);
}
switch (ScrollBars) {
case ScrollBars.Auto:
w.AddStyleAttribute (HtmlTextWriterStyle.Overflow, "auto");
writer.AddStyleAttribute (HtmlTextWriterStyle.Overflow, "auto");
break;
case ScrollBars.Both:
w.AddStyleAttribute (HtmlTextWriterStyle.Overflow, "scroll");
writer.AddStyleAttribute (HtmlTextWriterStyle.Overflow, "scroll");
break;
case ScrollBars.Horizontal:
w.AddStyleAttribute (HtmlTextWriterStyle.OverflowX, "scroll");
writer.AddStyleAttribute (HtmlTextWriterStyle.OverflowX, "scroll");
break;
case ScrollBars.Vertical:
w.AddStyleAttribute (HtmlTextWriterStyle.OverflowY, "scroll");
writer.AddStyleAttribute (HtmlTextWriterStyle.OverflowY, "scroll");
break;
}
if (!Wrap) {
w.AddStyleAttribute (HtmlTextWriterStyle.WhiteSpace, "nowrap");
writer.AddStyleAttribute (HtmlTextWriterStyle.WhiteSpace, "nowrap");
}
string align = "";
@ -102,7 +102,7 @@ namespace System.Web.UI.WebControls {
}
if (align != "")
w.AddStyleAttribute (HtmlTextWriterStyle.TextAlign, align);
writer.AddStyleAttribute (HtmlTextWriterStyle.TextAlign, align);
}
PanelStyle PanelStyle {
get { return (ControlStyle as PanelStyle); }