projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2009-10-30 Marek Habersack <mhabersack@novell.com>
[mono.git]
/
mcs
/
class
/
System.Web
/
System.Web.UI.WebControls
/
DataListItem.cs
diff --git
a/mcs/class/System.Web/System.Web.UI.WebControls/DataListItem.cs
b/mcs/class/System.Web/System.Web.UI.WebControls/DataListItem.cs
index 2ff82dc407f3c16618f582ce6db5133ec26348c9..3a17bf3b935ff43da50db9647873ad41b6c8beea 100644
(file)
--- a/
mcs/class/System.Web/System.Web.UI.WebControls/DataListItem.cs
+++ b/
mcs/class/System.Web/System.Web.UI.WebControls/DataListItem.cs
@@
-42,10
+42,9
@@
namespace System.Web.UI.WebControls {
#else
public class DataListItem : WebControl, INamingContainer {
#endif
#else
public class DataListItem : WebControl, INamingContainer {
#endif
- private int index;
- private ListItemType type;
- private object item;
-
+ int index;
+ ListItemType type;
+ object item;
public DataListItem (int itemIndex, ListItemType itemType)
{
public DataListItem (int itemIndex, ListItemType itemType)
{
@@
-53,7
+52,6
@@
namespace System.Web.UI.WebControls {
type = itemType;
}
type = itemType;
}
-
public virtual object DataItem {
get { return item; }
set { item = value; }
public virtual object DataItem {
get { return item; }
set { item = value; }
@@
-67,7
+65,6
@@
namespace System.Web.UI.WebControls {
get { return type; }
}
get { return type; }
}
-
protected override Style CreateControlStyle ()
{
return new TableItemStyle (ViewState);
protected override Style CreateControlStyle ()
{
return new TableItemStyle (ViewState);
@@
-105,8
+102,8
@@
namespace System.Web.UI.WebControls {
if (t != null) {
table = true;
foreach (TableRow tr in t.Rows) {
if (t != null) {
table = true;
foreach (TableRow tr in t.Rows) {
- if (ControlStyleCreated) {
-
ControlStyle.AddAttributesToRender (writer
);
+ if (ControlStyleCreated
&& !ControlStyle.IsEmpty
) {
+
tr.ControlStyle.MergeWith (ControlStyle
);
}
tr.RenderControl (writer);
}
}
tr.RenderControl (writer);
}