Imported Upstream version 5.2.0.175

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

View File

@ -113,22 +113,22 @@ namespace System.Web.UI.WebControls {
set { ViewState ["Text"] = value; }
}
protected virtual string FormatDataNavigateUrlValue (object value)
protected virtual string FormatDataNavigateUrlValue (object dataUrlValue)
{
string format = DataNavigateUrlFormatString;
if (format == "")
format = null;
return DataBinder.FormatResult (value, format);
return DataBinder.FormatResult (dataUrlValue, format);
}
protected virtual string FormatDataTextValue (object value)
protected virtual string FormatDataTextValue (object dataTextValue)
{
string format = DataTextFormatString;
if (format == "")
format = null;
return DataBinder.FormatResult (value, format);
return DataBinder.FormatResult (dataTextValue, format);
}
public override void Initialize ()
@ -155,11 +155,11 @@ namespace System.Web.UI.WebControls {
ctrl.Target = Target;
}
public override void InitializeCell (TableCell cell, int column_index, ListItemType item_type)
public override void InitializeCell (TableCell cell, int columnIndex, ListItemType itemType)
{
base.InitializeCell (cell, column_index, item_type);
base.InitializeCell (cell, columnIndex, itemType);
switch (item_type)
switch (itemType)
{
case ListItemType.Separator:
case ListItemType.Pager: