2005-11-02 Miguel de Icaza <miguel@novell.com>

        * Form.cs (Icon): If the icon is null, reset the icon to the
        default value.

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

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
index 9cf36edf0d88bc0ac9cc797e95dd634f3a080a45..669316335a30ef690e24ae782fe3253521b75b93 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
@@ -4,6 +4,9 @@
 
 2005-11-02  Miguel de Icaza  <miguel@novell.com>
 
+       * Form.cs (Icon): If the icon is null, reset the icon to the
+       default value. 
+
        * Cursor.cs: When writing the AND-mask bitmap do not include the
        number of colors, but hardcode those to two (black and white),
        fixes the loading of color cursors (Paint Dot Net).

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
index 420b4e9e8c813145a4281b2e544d42e811014016..46b907266efce9d9646b844d2e070556fb8f7b8b 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
@@ -356,7 +356,7 @@ namespace System.Windows.Forms {
                                        icon = value;
 
                                        if (IsHandleCreated) {
-                                               XplatUI.SetIcon(Handle, icon);
+                                               XplatUI.SetIcon(Handle, icon == null ? default_icon : icon);
                                        }
                                }
                        }