Author: jpobst
Date: 2007-11-19 22:18:19 -0500 (Mon, 19 Nov 2007)
New Revision: 89960

Modified:
   
branches/mono-1-2-6/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
   
branches/mono-1-2-6/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
Log:
2007-11-19  Everaldo Canuto  <[EMAIL PROTECTED]>
        [Backport to 1.2.6]
        * Form.cs: Check for empty Text before assign to cp.Caption in 
CreateParams
        it prevent problems when empty captions. [Fixes #342141]

Modified: 
branches/mono-1-2-6/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- 
branches/mono-1-2-6/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
  2007-11-20 02:42:40 UTC (rev 89959)
+++ 
branches/mono-1-2-6/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
  2007-11-20 03:18:19 UTC (rev 89960)
@@ -1,3 +1,8 @@
+2007-11-19  Everaldo Canuto  <[EMAIL PROTECTED]>
+       [Backport to 1.2.6]
+       * Form.cs: Check for empty Text before assign to cp.Caption in 
CreateParams
+       it prevent problems when empty captions. [Fixes #342141]
+
 2007-11-19  Jonathan Pobst  <[EMAIL PROTECTED]>
        [Backport to 1.2.6]
        * Label.cs: Use Size instead of None.  Fixes bug #342077.

Modified: 
branches/mono-1-2-6/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
===================================================================
--- 
branches/mono-1-2-6/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
    2007-11-20 02:42:40 UTC (rev 89959)
+++ 
branches/mono-1-2-6/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
    2007-11-20 03:18:19 UTC (rev 89960)
@@ -1323,8 +1323,8 @@
                        get {
                                CreateParams cp = new CreateParams ();
 
-                               cp.Caption = Text;
-                               cp.Caption = cp.Caption.Replace 
(Environment.NewLine, string.Empty);
+                               if (Text != null)
+                                       cp.Caption = Text.Replace 
(Environment.NewLine, string.Empty);
                                
                                cp.ClassName = XplatUI.DefaultClassName;
                                cp.ClassStyle = 0;

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

Reply via email to