Author: toshok
Date: 2007-01-10 21:21:16 -0500 (Wed, 10 Jan 2007)
New Revision: 70828
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: move the call to SendControlFocus into the same
is_loaded check.
2007-01-10 Chris Toshok <[EMAIL PROTECTED]>
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2007-01-11 02:00:12 UTC (rev 70827)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2007-01-11 02:21:16 UTC (rev 70828)
@@ -1,5 +1,10 @@
2007-01-10 Chris Toshok <[EMAIL PROTECTED]>
+ * Form.cs: move the call to SendControlFocus into the same
+ is_loaded check.
+
+2007-01-10 Chris Toshok <[EMAIL PROTECTED]>
+
* UpDownBase.cs (.ctor): remove the ActiveControl assignment here.
It breaks in the face of the new ActiveControl stuff, and should
be unnecessary.
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
2007-01-11 02:00:12 UTC (rev 70827)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
2007-01-11 02:21:16 UTC (rev 70828)
@@ -1929,11 +1929,12 @@
case Msg.WM_ACTIVATE: {
if (m.WParam !=
(IntPtr)WindowActiveFlags.WA_INACTIVE) {
- if (is_loaded)
+ if (is_loaded) {
SelectActiveControl ();
- if (ActiveControl != null &&
!ActiveControl.Focused)
- SendControlFocus
(ActiveControl);
+ if (ActiveControl !=
null && !ActiveControl.Focused)
+
SendControlFocus (ActiveControl);
+ }
OnActivated(EventArgs.Empty);
} else {
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches