2008-11-11 Jonathan Pobst <monkey@jpobst.com>

	* DataGridView.cs: Add internal to OnAutoSizeColumnModeChanged.
	* DataGridViewColumn.cs: Recalculate columns when AutoSizeMode changes.  Raise
	AutoSizeColumnModeChanged.
	[Fixes bug #443609]

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

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
index 22078c65fdc5a7ea469f4bf7c90930948028c0b6..da1baeb44a2f45546ca080e61079c6a34ef0d394 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,10 @@
+2008-11-11  Jonathan Pobst  <monkey@jpobst.com>
+
+       * DataGridView.cs: Add internal to OnAutoSizeColumnModeChanged.
+       * DataGridViewColumn.cs: Recalculate columns when AutoSizeMode changes.  Raise
+       AutoSizeColumnModeChanged.
+       [Fixes bug #443609]
+
 2008-11-11  Jonathan Pobst  <monkey@jpobst.com>
 
        * DataGridViewRowCollection.cs: Guard against the user deleting the

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridView.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridView.cs
index 667615cd846d8a6af8ff17b269f8ac7a921dc368..9aaf663f885096d3804b2e4c2644adf811f58436 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridView.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridView.cs
@@ -3271,7 +3271,7 @@ namespace System.Windows.Forms {
                                eh (this, e);
                }
 
-               protected virtual void OnAutoSizeColumnModeChanged (DataGridViewAutoSizeColumnModeEventArgs e)
+               protected internal virtual void OnAutoSizeColumnModeChanged (DataGridViewAutoSizeColumnModeEventArgs e)
                {
                        DataGridViewAutoSizeColumnModeEventHandler eh = (DataGridViewAutoSizeColumnModeEventHandler)(Events [AutoSizeColumnModeChangedEvent]);
                        if (eh != null)

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridViewColumn.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridViewColumn.cs
index dc1b0a1a465da73b99b6bed7900687ea3e12ab65..5309811309838d9c718c2e0ce48bfb27cd5fdfd0 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridViewColumn.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridViewColumn.cs
@@ -82,7 +82,17 @@ namespace System.Windows.Forms {
                [RefreshProperties (RefreshProperties.Repaint)]
                public DataGridViewAutoSizeColumnMode AutoSizeMode {
                        get { return autoSizeMode; }
-                       set { autoSizeMode = value; }
+                       set {
+                               if (autoSizeMode != value) {
+                                       DataGridViewAutoSizeColumnMode old_value = autoSizeMode;
+                                       autoSizeMode = value;
+                                       
+                                       if (DataGridView != null) {
+                                               DataGridView.OnAutoSizeColumnModeChanged (new DataGridViewAutoSizeColumnModeEventArgs (this, old_value));
+                                               DataGridView.AutoResizeColumnsInternal ();
+                                       }
+                               }
+                       }
                }
 
                [Browsable (false)]