2005-03-17 Jonathan Gilbert <logic@deltaq.org>

	* XplatUIX11.cs: Added call to XInitThreads() to allow multi-threaded
	  X access (avoids X-Async errors)

svn path=/trunk/mcs/; revision=41938

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
index d46350d46c260f91613094c4fb7242e7586f5773..9fa64b8f3a699204c0e54fee54bc4d5a18f0e38b 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-17  Jonathan Gilbert  <logic@deltaq.org>
+
+       * XplatUIX11.cs: Added call to XInitThreads() to allow multi-threaded
+         X access (avoids X-Async errors)
+
 2005-03-16  Jackson Harper  <jackson@ximian.com>
 
        * TabControl.cs: Raise the SelectedIndexChanged event.

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIX11.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIX11.cs
index 69233a745f8346eb08c74553df63ac2834dd54d8..63f0957cfbf87f3bcce88c2cc9e16c997e0d0266 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIX11.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIX11.cs
@@ -158,6 +158,7 @@ namespace System.Windows.Forms {
                        XlibLock = new object ();
                        MessageQueue = new XEventQueue ();
                        TimerList = new ArrayList ();
+                       XInitThreads();\r
 
                        ErrorExceptions = false;
 
@@ -3366,6 +3367,9 @@ namespace System.Windows.Forms {
 
                [DllImport ("libX11", EntryPoint="XGetErrorText")]
                internal extern static IntPtr XGetErrorText(IntPtr display, byte code, StringBuilder buffer, int length);
+
+               [DllImport ("libX11", EntryPoint="XInitThreads")]\r
+               internal extern static int XInitThreads();\r
                #endregion
        }
 }