Author: toshok
Date: 2006-08-27 17:04:02 -0400 (Sun, 27 Aug 2006)
New Revision: 64448

Modified:
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/AsyncMethodData.cs
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIX11.cs
Log:
2006-08-27  Chris Toshok  <[EMAIL PROTECTED]>

        * AsyncMethodData.cs: add a slot for the window handle.

        * XplatUIX11.cs (SendAsyncMethod): send the event to the right
        window (the destination control's window, not the foster window).

        * Control.cs (BeginInvokeInternal): store the window's handle in
        the AsyncMethodData.
        



Modified: 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/AsyncMethodData.cs
===================================================================
--- 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/AsyncMethodData.cs   
    2006-08-27 19:43:26 UTC (rev 64447)
+++ 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/AsyncMethodData.cs   
    2006-08-27 21:04:02 UTC (rev 64448)
@@ -30,6 +30,7 @@
 namespace System.Windows.Forms {
 
        internal class AsyncMethodData {
+               public IntPtr Handle;
                public Delegate Method;
                public object [] Args;
                public AsyncMethodResult Result;

Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2006-08-27 19:43:26 UTC (rev 64447)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2006-08-27 21:04:02 UTC (rev 64448)
@@ -1,3 +1,14 @@
+2006-08-27  Chris Toshok  <[EMAIL PROTECTED]>
+
+       * AsyncMethodData.cs: add a slot for the window handle.
+
+       * XplatUIX11.cs (SendAsyncMethod): send the event to the right
+       window (the destination control's window, not the foster window).
+
+       * Control.cs (BeginInvokeInternal): store the window's handle in
+       the AsyncMethodData.
+       
+
 2006-08-23  Peter Dennis Bartok  <[EMAIL PROTECTED]>
 
        * XplatUIX11.cs:

Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs       
2006-08-27 19:43:26 UTC (rev 64447)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs       
2006-08-27 21:04:02 UTC (rev 64448)
@@ -835,6 +835,7 @@
                        result = new AsyncMethodResult ();
                        data = new AsyncMethodData ();
 
+                       data.Handle = window.Handle;
                        data.Method = method;
                        data.Args = args;
                        data.Result = result;

Modified: 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIX11.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIX11.cs    
2006-08-27 19:43:26 UTC (rev 64447)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIX11.cs    
2006-08-27 21:04:02 UTC (rev 64448)
@@ -4035,11 +4035,11 @@
                        Hwnd    hwnd;
                        XEvent  xevent = new XEvent ();
 
-                       hwnd = Hwnd.ObjectFromHandle(FosterParent);
+                       hwnd = Hwnd.ObjectFromHandle(method.Handle);
 
                        xevent.type = XEventName.ClientMessage;
                        xevent.ClientMessageEvent.display = DisplayHandle;
-                       xevent.ClientMessageEvent.window = FosterParent;
+                       xevent.ClientMessageEvent.window = method.Handle;
                        xevent.ClientMessageEvent.message_type = 
(IntPtr)AsyncAtom;
                        xevent.ClientMessageEvent.format = 32;
                        xevent.ClientMessageEvent.ptr1 = (IntPtr) 
GCHandle.Alloc (method);

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

Reply via email to