2007-10-24 Ivan N. Zlatev <contact@i-nz.net>

        * DesignSurface.cs:
         - Fix a redundancy.
         - Dispose the loader if available.
        * DesignerHost.cs: serviceContainer can be null after disposing.

svn path=/trunk/mcs/; revision=88085

diff --git a/mcs/class/System.Design/System.ComponentModel.Design/ChangeLog b/mcs/class/System.Design/System.ComponentModel.Design/ChangeLog
index 0bea42b0b59e3c6b11cea395c9b0023346649f94..6172b7428ed27d3385f71348748c4486ca5b88b5 100644 (file)
--- a/mcs/class/System.Design/System.ComponentModel.Design/ChangeLog
+++ b/mcs/class/System.Design/System.ComponentModel.Design/ChangeLog
@@ -1,3 +1,10 @@
+2007-10-24  Ivan N. Zlatev  <contact@i-nz.net>
+
+       * DesignSurface.cs: 
+        - Fix a redundancy.
+        - Dispose the loader if available.
+       * DesignerHost.cs: serviceContainer can be null after disposing.
+
 2007-09-28  Atsushi Enomoto  <atsushi@ximian.com>
 
        * ByteViewer.cs : last one mile to finish 2.0 API (metadata wise).

diff --git a/mcs/class/System.Design/System.ComponentModel.Design/DesignSurface.cs b/mcs/class/System.Design/System.ComponentModel.Design/DesignSurface.cs
index bd8a6fbb1c672a27eda3c34969414ccfc94bc8ea..96c782e486de36a68ce6ee487a27f0414dbc3a71 100644 (file)
--- a/mcs/class/System.Design/System.ComponentModel.Design/DesignSurface.cs
+++ b/mcs/class/System.Design/System.ComponentModel.Design/DesignSurface.cs
@@ -245,6 +245,10 @@ namespace System.ComponentModel.Design
 
                protected virtual void Dispose (bool disposing)
                {
+                       if (_designerLoader != null) {
+                               _designerLoader.Dispose ();
+                               _designerLoader = null;
+                       }
                        if (_designerHost != null) {
                                _designerHost.Dispose ();
                                _designerHost.DesignerLoaderHostLoaded -= new LoadedEventHandler (OnDesignerHost_Loaded);
@@ -276,10 +280,7 @@ namespace System.ComponentModel.Design
 
                private void OnDesignerHost_Loaded (object sender, LoadedEventArgs e)
                {                  
-                       if (_loadErrors == null)
-                               _loadErrors = new object[0];
-                       
-                       this.OnLoaded (new LoadedEventArgs (e.HasSucceeded, _loadErrors));
+                       this.OnLoaded (e);
                }
 
                private void OnDesignerHost_Loading (object sender, EventArgs e)

diff --git a/mcs/class/System.Design/System.ComponentModel.Design/DesignerHost.cs b/mcs/class/System.Design/System.ComponentModel.Design/DesignerHost.cs
index 7ff7206cc754f6cb4dd6e8b8ea0fc335b64fda8e..77bbc62355ee122375ad5f70bc5b3accd8995d13 100644 (file)
--- a/mcs/class/System.Design/System.ComponentModel.Design/DesignerHost.cs
+++ b/mcs/class/System.Design/System.ComponentModel.Design/DesignerHost.cs
@@ -559,7 +559,9 @@ namespace System.ComponentModel.Design
 
        public new object GetService (Type serviceType)
        {
-               return _serviceProvider.GetService (serviceType);
+               if (_serviceProvider != null)
+                       return _serviceProvider.GetService (serviceType);
+               return null;
        }
                
 #endregion