[prev in list] [next in list] [prev in thread] [next in thread] 

List:       mono-patches
Subject:    [Mono-patches] r70276 -
From:       "Chris Toshok" <mono-patches-list () lists ! ximian ! com>
Date:       2006-12-31 2:54:32
Message-ID: 20061231025432.790039472C () mono-cvs ! ximian ! com
[Download RAW message or body]

Author: toshok
Date: 2006-12-30 21:54:32 -0500 (Sat, 30 Dec 2006)
New Revision: 70276

Modified:
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ContainerControl.cs
Log:
	* ContainerControl.cs: make sure we throw the exception if the
	container control doesn't contain the control we're setting
	ActiveControl to.

2006-12-30  Chris Toshok  <toshok@ximian.com>



Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog	2006-12-31 \
                02:40:44 UTC (rev 70275)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog	2006-12-31 \
02:54:32 UTC (rev 70276) @@ -1,5 +1,11 @@
 2006-12-30  Chris Toshok  <toshok@ximian.com>
 
+	* ContainerControl.cs: make sure we throw the exception if the
+	container control doesn't contain the control we're setting
+	ActiveControl to.
+
+2006-12-30  Chris Toshok  <toshok@ximian.com>
+
 	* Control.cs (SetTopLevel): fix the exception raised by
 	SetTopLevel for child controls.
 	(set_Anchor): call UpdateDistances when setting the anchor type.

Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ContainerControl.cs
 ===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ContainerControl.cs	2006-12-31 \
                02:40:44 UTC (rev 70275)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ContainerControl.cs	2006-12-31 \
02:54:32 UTC (rev 70276) @@ -69,7 +69,7 @@
 			}
 
 			set {
-				if (value==null || (active_control == value && active_control.has_focus) || \
!Contains(value)) { +				if (value==null || (active_control == value && \
active_control.has_focus)) {  return;
 				}
 

_______________________________________________
Mono-patches maillist  -  Mono-patches@lists.ximian.com
http://lists.ximian.com/mailman/listinfo/mono-patches


[prev in list] [next in list] [prev in thread] [next in thread]