2008-10-16 Ivan N. Zlatev <contact@i-nz.net>

	* TableLayoutSettings.cs: Fix NREs when deserializing and
	panel is not yet set.
	[Fixes bug #436199]

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

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
index 740998de48f8fe2caa8f70c6f3d8ed8142718945..83adf322adaf887c88f41407c670b135fb41d123 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,9 @@
+2008-10-16  Ivan N. Zlatev  <contact@i-nz.net>
+
+       * TableLayoutSettings.cs: Fix NREs when deserializing and 
+       panel is not yet set.
+       [Fixes bug #436199]
+
 2008-10-16  Jonathan Pobst  <monkey@jpobst.com>
 
        * DataGridView.cs: Invalidate after deleting a row.

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TableLayoutSettings.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TableLayoutSettings.cs
index 0318d1253699c409ff92cf418301d2e0a37efc08..cbdd4b47e77b26b6e4c649efe13f41d6c132fcf7 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TableLayoutSettings.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TableLayoutSettings.cs
@@ -97,7 +97,8 @@ namespace System.Windows.Forms
                                        
                                if (column_count != value) {
                                        column_count = value;
-                                       panel.PerformLayout (panel, "ColumnCount");
+                                       if (panel != null)
+                                               panel.PerformLayout (panel, "ColumnCount");
                                }
                        }
                }
@@ -116,13 +117,18 @@ namespace System.Windows.Forms
                                        
                                if (grow_style != value) {
                                        grow_style = value;
-                                       panel.PerformLayout (panel, "GrowStyle");
+                                       if (panel != null)
+                                               panel.PerformLayout (panel, "GrowStyle");
                                }
                        }
                }
                
                public override LayoutEngine LayoutEngine {
-                       get { return this.panel.LayoutEngine; }
+                       get {
+                               if (panel != null)
+                                       return panel.LayoutEngine;
+                               return base.LayoutEngine; 
+                       }
                }
                
                [DefaultValue (0)]