diff options
| author | Lluis Sanchez <lluis@novell.com> | 2005-02-02 19:22:40 +0300 |
|---|---|---|
| committer | Lluis Sanchez <lluis@novell.com> | 2005-02-02 19:22:40 +0300 |
| commit | 67c5bf8c5ac610e6a0dc99e2d581e35e7b244a3d (patch) | |
| tree | eba989518fa913820a6648d23f848a337cbd3b8b /mcs | |
| parent | f2451399d4af2b2443eed5c9506e320676b3eb0a (diff) | |
2005-02-02 Lluis Sanchez Gual <lluis@novell.com>
* ParseChildrenAttribute.cs: Set the correct default value for the
childType property.
svn path=/trunk/mcs/; revision=39993
Diffstat (limited to 'mcs')
| -rw-r--r-- | mcs/class/System.Web/System.Web.UI/ChangeLog | 5 | ||||
| -rwxr-xr-x | mcs/class/System.Web/System.Web.UI/ParseChildrenAttribute.cs | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/mcs/class/System.Web/System.Web.UI/ChangeLog b/mcs/class/System.Web/System.Web.UI/ChangeLog index 899a84591c4..a4a680ffdef 100644 --- a/mcs/class/System.Web/System.Web.UI/ChangeLog +++ b/mcs/class/System.Web/System.Web.UI/ChangeLog @@ -1,3 +1,8 @@ +2005-02-02 Lluis Sanchez Gual <lluis@novell.com> + + * ParseChildrenAttribute.cs: Set the correct default value for the + childType property. + 2005-01-28 Lluis Sanchez Gual <lluis@novell.com> * ParseChildrenAttribute.cs: Added 2.0 property. diff --git a/mcs/class/System.Web/System.Web.UI/ParseChildrenAttribute.cs b/mcs/class/System.Web/System.Web.UI/ParseChildrenAttribute.cs index f28fbe23f7c..a9f50099a4e 100755 --- a/mcs/class/System.Web/System.Web.UI/ParseChildrenAttribute.cs +++ b/mcs/class/System.Web/System.Web.UI/ParseChildrenAttribute.cs @@ -41,7 +41,7 @@ namespace System.Web.UI { public static readonly ParseChildrenAttribute Default = new ParseChildrenAttribute (); #if NET_2_0 - Type childType; + Type childType = typeof(System.Web.UI.Control); #endif // LAMESPEC |