2005-04-04 Jordi Mas i Hernandez <jordi@ximian.com>

	* Control.cs: use Equals to compare the font since no == op
	* ScrollBar.cs: use Equals to compare the font since no == op

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

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
index 7ce925d3ddab40bbc27631046312ee9ced711158..a9515f37084bfa268c055d6c5880ec83a3df3701 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-04  Jordi Mas i Hernandez <jordi@ximian.com>
+
+       * Control.cs: use Equals to compare the font since no == op
+       * ScrollBar.cs: use Equals to compare the font since no == op
+
 2005-04-04  Alexander Olk  <xenomorph2@onlinehome.de>
 
        * SaveFileDialog.cs: Open stream in OpenFile with FileMode Create

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
index 0153bc06b32f64fce66d883e7a8cc243015d22fd..2be5c18a5e4737c9f3cad3a783e42c55f6274091 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
@@ -1417,7 +1417,7 @@ namespace System.Windows.Forms
                        }
 
                        set {
-                               if (font == value) {
+                               if (font.Equals (value)) {
                                        return;
                                }
 

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ScrollBar.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ScrollBar.cs
index c69222e0195a0d0d053cc8a7157d273481d9091f..e38d189686ad6ce0a779608950b8955ff123cf8c 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ScrollBar.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ScrollBar.cs
@@ -257,7 +257,7 @@ namespace System.Windows.Forms
                {
                        get { return base.Font; }
                        set {
-                               if (base.Font == value)
+                               if (base.Font.Equals (value))
                                        return;
 
                                if (FontChanged != null)