Author: rolf
Date: 2007-07-20 13:00:38 -0400 (Fri, 20 Jul 2007)
New Revision: 82371

Modified:
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
Log:
* Form.cs: Don't check if the current form is the active form before
  activating it. Fixes #81904.

Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2007-07-20 16:57:16 UTC (rev 82370)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2007-07-20 17:00:38 UTC (rev 82371)
@@ -1,5 +1,10 @@
 2007-07-20  Rolf Bjarne Kvinge <[EMAIL PROTECTED]> 
 
+       * Form.cs: Don't check if the current form is the active form before
+         activating it. Fixes #81904.
+
+2007-07-20  Rolf Bjarne Kvinge <[EMAIL PROTECTED]> 
+
        * TreeView.cs: Apply patch from Tyron ([EMAIL PROTECTED]). Fixes #81847.
 
 2007-07-20  Rolf Bjarne Kvinge <[EMAIL PROTECTED]> 

Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs  
2007-07-20 16:57:16 UTC (rev 82370)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs  
2007-07-20 17:00:38 UTC (rev 82371)
@@ -1536,17 +1536,13 @@
                {
                        Form    active;
 
-                       // The docs say activate only activates if our app is 
already active
                        if (IsHandleCreated) {
                                if (IsMdiChild) {
                                        MdiParent.ActivateMdiChild (this);
                                } else if (IsMdiContainer) {
                                        mdi_container.SendFocusToActiveChild ();
                                } else {
-                                       active = ActiveForm;
-                                       if ((active != null) && (this != 
active)) {
-                                               XplatUI.Activate(window.Handle);
-                                       }
+                                       XplatUI.Activate(window.Handle);
                                }
                        }
                }

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

Reply via email to