diff options
| author | Atsushi Eno <atsushieno@gmail.com> | 2007-11-13 12:25:35 +0300 |
|---|---|---|
| committer | Atsushi Eno <atsushieno@gmail.com> | 2007-11-13 12:25:35 +0300 |
| commit | 73c5dae5f3d373056f098d92f7cac6a70c9b4344 (patch) | |
| tree | 625c8f9108552258c28d17aa53d6e5ea80ad12f6 /mcs/class/System/System.ComponentModel.Design.Serialization | |
| parent | e5e54f36c07bcce4904e11f41090ca33f996842c (diff) | |
2007-11-13 Atsushi Enomoto <atsushi@ximian.com>
* ResolveNameEventHandler.cs, RootDesignerSerializerAttribute.cs,
DesignerLoader.cs, SerializationStore.cs : couple of 2.0 API fixes.
svn path=/trunk/mcs/; revision=89528
Diffstat (limited to 'mcs/class/System/System.ComponentModel.Design.Serialization')
5 files changed, 17 insertions, 2 deletions
diff --git a/mcs/class/System/System.ComponentModel.Design.Serialization/ChangeLog b/mcs/class/System/System.ComponentModel.Design.Serialization/ChangeLog index 734db5489e1..7ab4293243d 100644 --- a/mcs/class/System/System.ComponentModel.Design.Serialization/ChangeLog +++ b/mcs/class/System/System.ComponentModel.Design.Serialization/ChangeLog @@ -1,3 +1,8 @@ +2007-11-13 Atsushi Enomoto <atsushi@ximian.com> + + * ResolveNameEventHandler.cs, RootDesignerSerializerAttribute.cs, + DesignerLoader.cs, SerializationStore.cs : couple of 2.0 API fixes. + 2007-11-01 Ivan N. Zlatev <contact@i-nz.net> * ResolveNameEventArgs.cs: Fix Value to not return and set Name. diff --git a/mcs/class/System/System.ComponentModel.Design.Serialization/DesignerLoader.cs b/mcs/class/System/System.ComponentModel.Design.Serialization/DesignerLoader.cs index 863af39dfe5..8cae096c82b 100644 --- a/mcs/class/System/System.ComponentModel.Design.Serialization/DesignerLoader.cs +++ b/mcs/class/System/System.ComponentModel.Design.Serialization/DesignerLoader.cs @@ -33,6 +33,9 @@ namespace System.ComponentModel.Design.Serialization { // This class is merely an interface with no implementation needed +#if NET_2_0 + [System.Runtime.InteropServices.ComVisible (true)] +#endif public abstract class DesignerLoader { diff --git a/mcs/class/System/System.ComponentModel.Design.Serialization/ResolveNameEventHandler.cs b/mcs/class/System/System.ComponentModel.Design.Serialization/ResolveNameEventHandler.cs index a1ce32f4597..c7fb28c0c4d 100644 --- a/mcs/class/System/System.ComponentModel.Design.Serialization/ResolveNameEventHandler.cs +++ b/mcs/class/System/System.ComponentModel.Design.Serialization/ResolveNameEventHandler.cs @@ -29,6 +29,8 @@ namespace System.ComponentModel.Design.Serialization { +#if !NET_2_0 [Serializable] +#endif public delegate void ResolveNameEventHandler (object sender, ResolveNameEventArgs e); } diff --git a/mcs/class/System/System.ComponentModel.Design.Serialization/RootDesignerSerializerAttribute.cs b/mcs/class/System/System.ComponentModel.Design.Serialization/RootDesignerSerializerAttribute.cs index d0be65f2e45..f8d94b7834f 100644 --- a/mcs/class/System/System.ComponentModel.Design.Serialization/RootDesignerSerializerAttribute.cs +++ b/mcs/class/System/System.ComponentModel.Design.Serialization/RootDesignerSerializerAttribute.cs @@ -33,6 +33,9 @@ namespace System.ComponentModel.Design.Serialization { [AttributeUsage(AttributeTargets.Class | AttributeTargets.Interface, AllowMultiple = true, Inherited = true)] +#if NET_2_0 + [Obsolete ("Use DesignerSerializerAttribute instead")] +#endif public sealed class RootDesignerSerializerAttribute : Attribute { private string serializer; diff --git a/mcs/class/System/System.ComponentModel.Design.Serialization/SerializationStore.cs b/mcs/class/System/System.ComponentModel.Design.Serialization/SerializationStore.cs index 406b18b181f..6b6bd7474a3 100644 --- a/mcs/class/System/System.ComponentModel.Design.Serialization/SerializationStore.cs +++ b/mcs/class/System/System.ComponentModel.Design.Serialization/SerializationStore.cs @@ -30,20 +30,22 @@ #if NET_2_0 using System; +using System.Collections; using System.IO; namespace System.ComponentModel.Design.Serialization { public abstract class SerializationStore : IDisposable { - public SerializationStore () + protected SerializationStore () { } + public abstract ICollection Errors { get; } public abstract void Close (); public abstract void Save (Stream stream); - public void Dispose (bool disposing) + protected virtual void Dispose (bool disposing) { if (disposing) this.Close (); |