Author: toshok
Date: 2007-01-11 18:50:21 -0500 (Thu, 11 Jan 2007)
New Revision: 70892
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms.X11Internal/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms.X11Internal/X11Display.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIX11.cs
Log:
In System.Windows.Forms.X11Internal:
2007-01-11 Chris Toshok <[EMAIL PROTECTED]>
* X11Display.cs: don't send duplicate WM_ACTIVATE messages to the
initial form.
In System.Windows.Forms:
* XplatUIX11.cs: don't send duplicate WM_ACTIVATE messages to the
initial form.
2007-01-11 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 23:24:31 UTC (rev 70891)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2007-01-11 23:50:21 UTC (rev 70892)
@@ -1,5 +1,10 @@
2007-01-11 Chris Toshok <[EMAIL PROTECTED]>
+ * XplatUIX11.cs: don't send duplicate WM_ACTIVATE messages to the
+ initial form.
+
+2007-01-11 Chris Toshok <[EMAIL PROTECTED]>
+
* LinkLabel.cs: make sure to call base.Select in our Select method
if it turns out we're going to be selected (i.e. if we have a link
that is going to receive focus). That way our container's
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIX11.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIX11.cs
2007-01-11 23:24:31 UTC (rev 70891)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIX11.cs
2007-01-11 23:50:21 UTC (rev 70892)
@@ -3645,8 +3645,10 @@
Form form = c.FindForm ();
if (form == null)
goto ProcessNextMessage;
- ActiveWindow = form.Handle;
- SendMessage (ActiveWindow,
Msg.WM_ACTIVATE, (IntPtr) WindowActiveFlags.WA_ACTIVE, IntPtr.Zero);
+ if (ActiveWindow !=
form.Handle) {
+ ActiveWindow =
form.Handle;
+ SendMessage
(ActiveWindow, Msg.WM_ACTIVATE, (IntPtr) WindowActiveFlags.WA_ACTIVE,
IntPtr.Zero);
+ }
goto ProcessNextMessage;
}
Keyboard.FocusIn(FocusWindow);
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms.X11Internal/ChangeLog
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms.X11Internal/ChangeLog
2007-01-11 23:24:31 UTC (rev 70891)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms.X11Internal/ChangeLog
2007-01-11 23:50:21 UTC (rev 70892)
@@ -1,3 +1,8 @@
+2007-01-11 Chris Toshok <[EMAIL PROTECTED]>
+
+ * X11Display.cs: don't send duplicate WM_ACTIVATE messages to the
+ initial form.
+
2007-01-06 Everaldo Canuto <[EMAIL PROTECTED]>
* X11Hwnd.cs, XplatUIX11-new.cs:
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms.X11Internal/X11Display.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms.X11Internal/X11Display.cs
2007-01-11 23:24:31 UTC (rev 70891)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms.X11Internal/X11Display.cs
2007-01-11 23:50:21 UTC (rev 70892)
@@ -2191,8 +2191,11 @@
Form form = c.FindForm ();
if (form == null)
goto ProcessNextMessage;
- ActiveWindow =
(X11Hwnd)Hwnd.ObjectFromHandle (form.Handle);
- SendMessage
(ActiveWindow.Handle, Msg.WM_ACTIVATE, (IntPtr) WindowActiveFlags.WA_ACTIVE,
IntPtr.Zero);
+ X11Hwnd new_active =
(X11Hwnd)Hwnd.ObjectFromHandle (form.Handle);
+ if (ActiveWindow != new_active)
{
+ ActiveWindow =
new_active;
+ SendMessage
(ActiveWindow.Handle, Msg.WM_ACTIVATE, (IntPtr) WindowActiveFlags.WA_ACTIVE,
IntPtr.Zero);
+ }
goto ProcessNextMessage;
}
Keyboard.FocusIn(FocusWindow.Handle);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches