Author: toshok
Date: 2007-03-23 13:05:10 -0500 (Fri, 23 Mar 2007)
New Revision: 74895

Modified:
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
   
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridTextBoxColumn.cs
Log:
2007-03-23  Chris Toshok  <[EMAIL PROTECTED]>

        * DataGridTextBoxColumn.cs (GetFormattedValue): don't try to
        format objects if the format spec is "".  Fixes bug #80889.



Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2007-03-23 18:03:41 UTC (rev 74894)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2007-03-23 18:05:10 UTC (rev 74895)
@@ -1,3 +1,8 @@
+2007-03-23  Chris Toshok  <[EMAIL PROTECTED]>
+
+       * DataGridTextBoxColumn.cs (GetFormattedValue): don't try to
+       format objects if the format spec is "".  Fixes bug #80889.
+
 2007-03-22  Miguel de Icaza  <[EMAIL PROTECTED]>
 
        * ToolStripPanel.cs (Join): added stubs to build PDN3

Modified: 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridTextBoxColumn.cs
===================================================================
--- 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridTextBoxColumn.cs
 2007-03-23 18:03:41 UTC (rev 74894)
+++ 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridTextBoxColumn.cs
 2007-03-23 18:05:10 UTC (rev 74895)
@@ -326,9 +326,8 @@
                        if (DBNull.Value.Equals(obj) || obj == null)
                                return NullText;
                        
-                       if (format != null && obj as IFormattable != null) {
+                       if (format != null && format != String.Empty && obj as 
IFormattable != null)
                                return ((IFormattable)obj).ToString (format, 
format_provider);
-                       }
 
                        return obj.ToString ();
 

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to