Attachment 345288 Details for Bug 515507

Current patch.

fix-deadlock.patch (text/plain), 49.89 KB, created by Michael Gorse on 2010-02-26 15:49:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Gorse

Created: 2010-02-26 15:49:05 UTC

Size: 49.89 KB

patch

obsolete

>Index: /trunk/uia2atk/UiaAtkBridge/Test/AtkTest/AtkTester.cs
>===================================================================
>--- /trunk/uia2atk/UiaAtkBridge/Test/AtkTest/AtkTester.cs	(revision 138881)
>+++ /trunk/uia2atk/UiaAtkBridge/Test/AtkTest/AtkTester.cs	(working copy)
>@@ -33,7 +33,7 @@
> namespace UiaAtkBridgeTest
> {
> 	
>-	public abstract class AtkTester {
>+	public abstract class AtkTester : TestBase {
> 
> 		public abstract Atk.Object GetAccessible (BasicWidgetType type);
> 		
>@@ -343,6 +343,7 @@
> 				               "menu child of combobox should be visible and showing NOW!");
> 			}
> 
>+			GlibSync ();
> 			if (type == BasicWidgetType.ComboBoxItem)
> 				Assert.AreEqual (accessible.Name, accessible.Parent.Parent.Name, "action on combobox item should yield selection");
> 			
>@@ -561,6 +562,7 @@
> 				         type == BasicWidgetType.ListBox ||
> 				         type == BasicWidgetType.CheckedListBox)
> 					accName = null;
>+				GlibSync ();
> 				Assert.AreEqual (accName, accessible.Name, "AtkObj Name #" + i + ", we got: " + accessible.Name);
> 
> 				Atk.Object refSelObj = implementor.RefSelection (0);
>@@ -949,6 +951,7 @@
> 		
> 		protected void PropertyRole (BasicWidgetType type, Atk.Object accessible)
> 		{
>+			GlibSync ();
> 			Atk.Role role = GetRole (type);
> 			Assert.AreEqual (role, accessible.Role, "Atk.Role, we got " + accessible.Role);
> 		}
>@@ -1918,39 +1921,6 @@
> 			                   " contains the following states: " + res);
> 		}
> 			
>-		public static void States (Atk.Object accessible, params Atk.StateType [] expected)
>-		{
>-			List <Atk.StateType> expectedStates = new List <Atk.StateType> (expected);
>-			List <Atk.StateType> missingStates = new List <Atk.StateType> ();
>-			List <Atk.StateType> superfluousStates = new List <Atk.StateType> ();
>-			
>-			Atk.StateSet stateSet = accessible.RefStateSet ();
>-			foreach (Atk.StateType state in Enum.GetValues (typeof (Atk.StateType))) {
>-				if (expectedStates.Contains (state) && 
>-				    (!(stateSet.ContainsState (state))))
>-					missingStates.Add (state);
>-				else if ((!expectedStates.Contains (state)) && 
>-					     (stateSet.ContainsState (state)))
>-					superfluousStates.Add (state);
>-			}
>-
>-			string missingStatesMsg = string.Empty;
>-			string superfluousStatesMsg = string.Empty;
>-
>-			if (missingStates.Count != 0) {
>-				missingStatesMsg = "Missing states: ";
>-				foreach (Atk.StateType state in missingStates)
>-					missingStatesMsg += state.ToString () + ",";
>-			}
>-			if (superfluousStates.Count != 0) {
>-				superfluousStatesMsg = "Superfluous states: ";
>-				foreach (Atk.StateType state in superfluousStates)
>-					superfluousStatesMsg += state.ToString () + ",";
>-			}
>-			Assert.IsTrue ((missingStates.Count == 0) && (superfluousStates.Count == 0),
>-				missingStatesMsg + " .. " + superfluousStatesMsg);
>-		}
>-
> 		protected void Relations (Atk.Object accessible, BasicWidgetType type)
> 		{
> 			if (type != BasicWidgetType.RadioButton) {
>@@ -2151,6 +2121,7 @@
> 			Atk.Component atkComponent = CastToAtkInterface<Atk.Component> (accessible);
> 			EventMonitor.Start ();
> 			atkComponent.GrabFocus ();
>+			GlibSync ();
> 			EventCollection events = EventMonitor.Pause ();
> 			int expectedCount = (transient ? 1 : 2);
> 			string evType = (transient? "object:active-descendant-changed": "object:state-changed:focused");
>@@ -2194,50 +2165,6 @@
> 			return value.SetCurrentValue (gv);
> 		}
> 
>-		private EventCollection events = null;
>-
>-		protected void StartEventMonitor ()
>-		{
>-			events = null;
>-			EventMonitor.Start ();
>-		}
>-
>-		protected void ExpectEvents (int count, Atk.Role role, string evType)
>-		{
>-			if (events == null)
>-				events = EventMonitor.Pause ();
>-			EventCollection evs = events.FindByRole (role).FindByType (evType);
>-			string eventsInXml = String.Format (" events in XML: {0}", Environment.NewLine + events.OriginalGrossXml);
>-			Assert.AreEqual (count, evs.Count, "bad number of " + evType + " events: " + eventsInXml);
>-		}
>-
>-		protected void ExpectEvents (int count, Atk.Role role, string evType, int detail1)
>-		{
>-			if (events == null)
>-				events = EventMonitor.Pause ();
>-			EventCollection evs = events.FindByRole (role).FindByType (evType).FindWithDetail1 (detail1.ToString ());
>-			string eventsInXml = String.Format (" events in XML: {0}", Environment.NewLine + events.OriginalGrossXml);
>-			Assert.AreEqual (count, evs.Count, "bad number of " + evType + " events: " + eventsInXml);
>-		}
>-
>-		protected void ExpectEvents (int count, Atk.Role role, string evType, string name)
>-		{
>-			if (events == null)
>-				events = EventMonitor.Pause ();
>-			EventCollection evs = events.FindByRole (role).FindByType (evType).FindByName (name);
>-			string eventsInXml = String.Format (" events in XML: {0}", Environment.NewLine + events.OriginalGrossXml);
>-			Assert.AreEqual (count, evs.Count, "bad number of " + evType + " events: " + eventsInXml);
>-		}
>-
>-		protected void ExpectEvents (int min, int max, Atk.Role role, string evType)
>-		{
>-			if (events == null)
>-				events = EventMonitor.Pause ();
>-			EventCollection evs = events.FindByRole (role).FindByType (evType);
>-			string eventsInXml = String.Format (" events in XML: {0}", Environment.NewLine + events.OriginalGrossXml);
>-			Assert.IsTrue (evs.Count >= min && evs.Count <= max, "Expected " + min +"-" + max +" " + evType + " events but got " + evs.Count +": " + eventsInXml);
>-		}
>-
> 		protected bool DoActionByName (Atk.Object accessible, string name)
> 		{
> 			Atk.Action atkAction = CastToAtkInterface<Atk.Action> (accessible);
>Index: /trunk/uia2atk/UiaAtkBridge/Test/AtkTest/EventMonitor.cs
>===================================================================
>--- /trunk/uia2atk/UiaAtkBridge/Test/AtkTest/EventMonitor.cs	(revision 138881)
>+++ /trunk/uia2atk/UiaAtkBridge/Test/AtkTest/EventMonitor.cs	(working copy)
>@@ -38,6 +38,7 @@
> 		static object locking = new object ();
> 		
> 		public static void Start () {
>+			TestBase.GlibSync ();
> 			lock (locking) {
> 				if (singleton == null)
> 					singleton = new EventMonitor ();
>@@ -76,6 +77,7 @@
> 		}
> 
> 		public static EventCollection Pause () {
>+			TestBase.GlibSync ();
> 			lock (locking) {
> 				if (singleton == null)
> 					throw new Exception ("EventMonitor has not been started yet");
>Index: /trunk/uia2atk/UiaAtkBridge/Test/AtkTest/Makefile.am
>===================================================================
>--- /trunk/uia2atk/UiaAtkBridge/Test/AtkTest/Makefile.am	(revision 138881)
>+++ /trunk/uia2atk/UiaAtkBridge/Test/AtkTest/Makefile.am	(working copy)
>@@ -44,7 +44,8 @@
> 	AtSpiEvent.cs \
> 	BasicWidgetType.cs \
> 	EventCollection.cs \
>-	EventMonitor.cs
>+	EventMonitor.cs \
>+	TestBase.cs
> 
> DATA_FILES = 
> 
>Index: /trunk/uia2atk/UiaAtkBridge/Test/AtkTest/TestBase.cs
>===================================================================
>--- /trunk/uia2atk/UiaAtkBridge/Test/AtkTest/TestBase.cs	(revision 0)
>+++ /trunk/uia2atk/UiaAtkBridge/Test/AtkTest/TestBase.cs	(revision 0)
>@@ -0,0 +1,130 @@
>+// Permission is hereby granted, free of charge, to any person obtaining 
>+// a copy of this software and associated documentation files (the 
>+// "Software"), to deal in the Software without restriction, including 
>+// without limitation the rights to use, copy, modify, merge, publish, 
>+// distribute, sublicense, and/or sell copies of the Software, and to 
>+// permit persons to whom the Software is furnished to do so, subject to 
>+// the following conditions: 
>+//  
>+// The above copyright notice and this permission notice shall be 
>+// included in all copies or substantial portions of the Software. 
>+//  
>+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
>+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
>+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
>+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE 
>+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION 
>+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION 
>+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
>+// 
>+// Copyright (c) 2008,2009 Novell, Inc. (http://www.novell.com) 
>+// 
>+// Authors: 
>+//      Andres G. Aragoneses <aaragoneses@novell.com>
>+// 
>+
>+using System;
>+using System.Xml;
>+
>+using System.Collections.Generic;
>+
>+using NUnit.Framework;
>+
>+namespace UiaAtkBridgeTest
>+{
>+	
>+	public abstract class TestBase {
>+
>+		private EventCollection events = null;
>+
>+		public static void GlibSync ()
>+		{
>+			System.Threading.AutoResetEvent sync = new System.Threading.AutoResetEvent (false);
>+			GLib.Timeout.Add (0, new GLib.TimeoutHandler (delegate {
>+				sync.Set ();
>+				return false;
>+			}));
>+			sync.WaitOne ();
>+			sync.Close ();
>+		}
>+
>+		protected void StartEventMonitor ()
>+		{
>+			events = null;
>+			EventMonitor.Start ();
>+		}
>+
>+		protected void ExpectEvents (int count, Atk.Role role, string evType)
>+		{
>+			if (events == null)
>+				events = EventMonitor.Pause ();
>+			EventCollection evs = events.FindByRole (role).FindByType (evType);
>+			string eventsInXml = String.Format (" events in XML: {0}", Environment.NewLine + events.OriginalGrossXml);
>+			Assert.AreEqual (count, evs.Count, "bad number of " + evType + " events: " + eventsInXml);
>+		}
>+
>+		protected void ExpectEvents (int count, Atk.Role role, string evType, int detail1)
>+		{
>+			GlibSync ();
>+			if (events == null)
>+				events = EventMonitor.Pause ();
>+			EventCollection evs = events.FindByRole (role).FindByType (evType).FindWithDetail1 (detail1.ToString ());
>+			string eventsInXml = String.Format (" events in XML: {0}", Environment.NewLine + events.OriginalGrossXml);
>+			Assert.AreEqual (count, evs.Count, "bad number of " + evType + " events: " + eventsInXml);
>+		}
>+
>+		protected void ExpectEvents (int count, Atk.Role role, string evType, string name)
>+		{
>+			GlibSync ();
>+			if (events == null)
>+				events = EventMonitor.Pause ();
>+			EventCollection evs = events.FindByRole (role).FindByType (evType).FindByName (name);
>+			string eventsInXml = String.Format (" events in XML: {0}", Environment.NewLine + events.OriginalGrossXml);
>+			Assert.AreEqual (count, evs.Count, "bad number of " + evType + " events: " + eventsInXml);
>+		}
>+
>+		protected void ExpectEvents (int min, int max, Atk.Role role, string evType)
>+		{
>+			GlibSync ();
>+			if (events == null)
>+				events = EventMonitor.Pause ();
>+			EventCollection evs = events.FindByRole (role).FindByType (evType);
>+			string eventsInXml = String.Format (" events in XML: {0}", Environment.NewLine + events.OriginalGrossXml);
>+			Assert.IsTrue (evs.Count >= min && evs.Count <= max, "Expected " + min +"-" + max +" " + evType + " events but got " + evs.Count +": " + eventsInXml);
>+		}
>+
>+		public static void States (Atk.Object accessible, params Atk.StateType [] expected)
>+		{
>+			List <Atk.StateType> expectedStates = new List <Atk.StateType> (expected);
>+			List <Atk.StateType> missingStates = new List <Atk.StateType> ();
>+			List <Atk.StateType> superfluousStates = new List <Atk.StateType> ();
>+			
>+			Atk.StateSet stateSet = accessible.RefStateSet ();
>+			foreach (Atk.StateType state in Enum.GetValues (typeof (Atk.StateType))) {
>+				if (expectedStates.Contains (state) && 
>+				    (!(stateSet.ContainsState (state))))
>+					missingStates.Add (state);
>+				else if ((!expectedStates.Contains (state)) && 
>+					     (stateSet.ContainsState (state)))
>+					superfluousStates.Add (state);
>+			}
>+
>+			string missingStatesMsg = string.Empty;
>+			string superfluousStatesMsg = string.Empty;
>+
>+			if (missingStates.Count != 0) {
>+				missingStatesMsg = "Missing states: ";
>+				foreach (Atk.StateType state in missingStates)
>+					missingStatesMsg += state.ToString () + ",";
>+			}
>+			if (superfluousStates.Count != 0) {
>+				superfluousStatesMsg = "Superfluous states: ";
>+				foreach (Atk.StateType state in superfluousStates)
>+					superfluousStatesMsg += state.ToString () + ",";
>+			}
>+			Assert.IsTrue ((missingStates.Count == 0) && (superfluousStates.Count == 0),
>+				missingStatesMsg + " .. " + superfluousStatesMsg);
>+		}
>+
>+	}
>+}
>Index: /trunk/uia2atk/UiaAtkBridge/Test/UiaAtkBridgeTest/BridgeTester.cs
>===================================================================
>--- /trunk/uia2atk/UiaAtkBridge/Test/UiaAtkBridgeTest/BridgeTester.cs	(revision 138881)
>+++ /trunk/uia2atk/UiaAtkBridge/Test/UiaAtkBridgeTest/BridgeTester.cs	(working copy)
>@@ -691,6 +691,7 @@
> 					type.ToString ());
> 			}
> 
>+			GlibSync ();
> 			return accessible;
> 		}
> 		
>@@ -1019,6 +1020,7 @@
> 					type.ToString ());
> 			}
> 
>+			GlibSync ();
> 			return accessible;
> 		}
> 
>@@ -1060,6 +1062,7 @@
> 				contextMenu.Show (lab1, 0, 0);
> 				widget = contextMenu;
> 			}
>+			GlibSync ();
> 			return GetAdapterForWidget (widget);
> 		}
> 
>Index: /trunk/uia2atk/UiaAtkBridge/Test/UiaAtkBridgeTest/BridgeTests.cs
>===================================================================
>--- /trunk/uia2atk/UiaAtkBridge/Test/UiaAtkBridgeTest/BridgeTests.cs	(revision 138881)
>+++ /trunk/uia2atk/UiaAtkBridge/Test/UiaAtkBridgeTest/BridgeTests.cs	(working copy)
>@@ -35,6 +35,7 @@
> using System.Threading;
> 
> //only used for the regression test:
>+using SDP = System.Drawing.Printing;
> using SWF = System.Windows.Forms;
> using System.Drawing;
> using SD = System.Data;
>@@ -289,6 +290,7 @@
> 			Assert.IsNotNull (accessible, "Adapter should not be null");
> 			// 2 groups
> 			Assert.AreEqual (2, accessible.NAccessibleChildren, "NAccessibleChildren #1");
>+			GlibSync ();
> 			Atk.Object group1 = FindObjectByName (accessible, groupName);
> 			Assert.IsNotNull (group1, "FindObjectByName (" + groupName + ")");
> 			Assert.AreEqual (Atk.Role.LayeredPane, group1.Role, "Group1 role");
>@@ -366,6 +368,7 @@
> 			Assert.AreEqual ("item2", atkTable.RefAt (row2, col2).Name, "Cell ("+row2+", " +col2 + ")");
> 			row2 = (atkTable.NRows == 4? 2: 1);
> 			col2 = 0;
>+			GlibSync ();
> 			Assert.AreEqual ("item3", atkTable.RefAt (row2, col2).Name, "Cell ("+row2+", " +col2 + ")");
> 			row2 = (atkTable.NRows == 4? 3: 1);
> 			col2 = (atkTable.NRows == 4? 0: 1);
>@@ -518,6 +521,7 @@
> 			Assert.AreEqual (3, accessible.NAccessibleChildren, "NAccessibleChildren");
> 
> 			Atk.Object cell = accessible.RefAccessibleChild (2);
>+			GlibSync ();
> 			Assert.AreEqual (Atk.Role.TableCell, cell.Role, "cell Role");
> 
> 			// Calling Focus on the DataGrid appears not to work.
>@@ -632,6 +636,7 @@
> 			Assert.AreEqual (3, accessible.NAccessibleChildren, "NAccessibleChildren #1");
> 			
> 			Atk.Object child1 = accessible.RefAccessibleChild (0);
>+			GlibSync ();
> 			Assert.AreEqual (Atk.Role.Label, child1.Role, "Child role #1");
> 			InterfaceText (child1, "first item");
> 			
>@@ -804,6 +809,7 @@
> 					= CastToAtkInterface <Atk.Action> (accessible);
> 				atkAction.DoAction (0);
> 
>+				GlibSync ();
> 				States (accessible,
> 					Atk.StateType.Focused,
> 					Atk.StateType.Focusable,
>@@ -886,6 +892,7 @@
> 			InterfaceComponent (type, atkComponent);
> 
> 			Assert.AreEqual (panel.NAccessibleChildren, 0, "StatusBar panel should not have children");
>+			GlibSync ();
> 			Assert.AreEqual (panelText, panel.Name, "Panel name should match the text");
> 			InterfaceText (panel, panelText);
> 
>@@ -1174,6 +1181,7 @@
> 			lab.IsLink = true;
> 			toolStrip.Items.Add (lab);
> 			Atk.Object accessible = GetAdapterForWidget (lab);
>+			GlibSync ();
> 			Assert.AreEqual (Atk.Role.Label, accessible.Role, "A ToolStripLabel with IsLink==True should not have an unknown role");
> 			toolStrip.Items.Remove (lab);
> 		}
>@@ -1455,6 +1463,7 @@
> 			Assert.IsTrue (accessible.RefAccessibleChild (1).NAccessibleChildren > 0);
> 
> 			//BNC#479113
>+			GlibSync ();
> 			bool a11yFound = false;
> 			for (int i = 0; i < accessible.NAccessibleChildren; i++) {
> 				var table = accessible.RefAccessibleChild (i).RefAccessibleChild (0);
>Index: /trunk/uia2atk/UiaAtkBridge/Test/UiaAtkBridgeTest/DialogTester.cs
>===================================================================
>--- /trunk/uia2atk/UiaAtkBridge/Test/UiaAtkBridgeTest/DialogTester.cs	(revision 138881)
>+++ /trunk/uia2atk/UiaAtkBridge/Test/UiaAtkBridgeTest/DialogTester.cs	(working copy)
>@@ -23,6 +23,7 @@
> //      Andres G. Aragoneses <aaragoneses@novell.com>
> // 
> using System;
>+using SDP = System.Drawing.Printing;
> using SWF = System.Windows.Forms;
> 
> using NUnit.Framework;
>@@ -32,7 +33,7 @@
> {
> 
> 	[TestFixture]
>-	public class DialogTester {
>+	public class DialogTester : TestBase {
> 
> 		[Test]
> 		public void OpenFileDialog ()
>@@ -47,7 +48,7 @@
> 				Assert.AreEqual (5, popupButtonPanelAdapter.NAccessibleChildren, "PopupButtonPanel (toolbar) should have 5 children");
> 
> 				Atk.Object popupButtonAdapter1 = popupButtonPanelAdapter.RefAccessibleChild (0).RefAccessibleChild (0);
>-				AtkTester.States (popupButtonAdapter1,
>+				States (popupButtonAdapter1,
> 				                  Atk.StateType.Enabled,
> 				                  Atk.StateType.Selectable,
> 				                  Atk.StateType.Focusable,
>@@ -67,6 +68,7 @@
> 				//Assert.AreEqual ("invoke", atkAction.GetName (1), "TableCell Action.GetName (1)");
> 
> 				Atk.Object comboBox = dialogAdapter.RefAccessibleChild (8);
>+				GlibSync ();
> 				Assert.AreEqual (Atk.Role.ComboBox, comboBox.Role, "ComboBox Role");
> 				Atk.Object list = comboBox.RefAccessibleChild (0);
> 				Assert.IsTrue (list.NAccessibleChildren > 0, "ComboBox child should have children");
>@@ -122,6 +124,27 @@
> 			}
> 		}
> 
>+		//[Test]
>+		public void PrintPreviewDialog ()
>+		{
>+			SWF.PrintPreviewDialog dialog = new SWF.PrintPreviewDialog ();
>+			dialog.Document = new SDP.PrintDocument ();
>+			using (var runner = new DialogRunner (dialog)) {
>+				VerifyBasicProperties (runner.Dialog);
>+			UiaAtkBridge.Window dialogAdapter = BridgeTester.GetAdapterForWidget (runner.Dialog) as UiaAtkBridge.Window;
>+			Atk.Object toolBar = dialogAdapter.RefAccessibleChild (0);
>+			Assert.AreEqual (Atk.Role.ToolBar, toolBar.Role, "ToolBar role");
>+			Atk.Object filler = toolBar.RefAccessibleChild (4);
>+			Assert.AreEqual (Atk.Role.Filler, filler.Role, "filler role");
>+			Atk.Object toggleButton = filler.RefAccessibleChild (1);
>+			Assert.AreEqual (Atk.Role.ToggleButton, toggleButton.Role, "toggleButton role");
>+			Atk.Action action = Atk.ActionAdapter.GetObject (toggleButton.Handle, false);
>+			runner.Dialog.Invoke (new SWF.MethodInvoker (delegate {
>+				action.DoAction (0);
>+			}));
>+			}
>+		}
>+
> 		//TODO: test Atk.Role.Dialog when using ShowDialog() [currently threading problems]
> 		private void VerifyBasicProperties (System.ComponentModel.Component dialog)
> 		{
>@@ -134,31 +157,32 @@
> 	public class DialogRunner : IDisposable
> 	{
> 		private SWF.CommonDialog commonDialog;
>-		private SWF.ThreadExceptionDialog threadExceptionDialog;
>+		private SWF.Form formDialog;
> 		private SWF.Form f;
> 
> 		public DialogRunner (System.ComponentModel.Component dialog)
> 		{
> 			commonDialog = dialog as SWF.CommonDialog;
> 			if (commonDialog == null)
>-				threadExceptionDialog = dialog as SWF.ThreadExceptionDialog;
>-			if (commonDialog == null && threadExceptionDialog == null)
>+				formDialog = dialog as SWF.Form;
>+			if (commonDialog == null && formDialog == null)
> 				throw new ArgumentException ("Unsupported dialog type: " + dialog);
> 
> 			Show ();
>+			TestBase.GlibSync ();
> 		}
> 
> 		public void Dispose ()
> 		{
> 			if (commonDialog != null)
> 				commonDialog.Dispose ();
>-			else if (threadExceptionDialog != null) {
>-				if (threadExceptionDialog.InvokeRequired) {
>-					threadExceptionDialog.BeginInvoke (new SWF.MethodInvoker (Dispose));
>+			else if (formDialog != null) {
>+				if (formDialog.InvokeRequired) {
>+					formDialog.BeginInvoke (new SWF.MethodInvoker (Dispose));
> 					return;
> 				}
>-				threadExceptionDialog.Close ();
>-				threadExceptionDialog.Dispose ();
>+				formDialog.Close ();
>+				formDialog.Dispose ();
> 			}
> 		}
> 
>@@ -177,8 +201,8 @@
> 					methodInfo.Invoke (commonDialog, new object [] { f.Handle });
> 				}
> 			}
>-			else if (threadExceptionDialog != null)
>-				f = threadExceptionDialog;
>+			else if (formDialog != null)
>+				f = formDialog;
> 
> 			f.Show ();
> 		}
>Index: /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/Adapter.cs
>===================================================================
>--- /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/Adapter.cs	(revision 138881)
>+++ /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/Adapter.cs	(working copy)
>@@ -53,6 +53,127 @@
> 			NotifyStateChange (state, RefStateSet ().ContainsState (state));
> 		}
> 		
>+		internal new void NotifyStateChange (Atk.StateType state, bool val)
>+		{
>+			GLib.Timeout.Add (0, new GLib.TimeoutHandler (delegate {
>+				base.NotifyStateChange (state, val);
>+				return false;
>+			}));
>+		}
>+
>+		internal void EmitSignal (string name)
>+		{
>+			GLib.Timeout.Add (0, new GLib.TimeoutHandler (delegate {
>+				GLib.Signal.Emit (this, name);
>+				return false;
>+			}));
>+		}
>+
>+		internal void EmitSignal (string name, object o)
>+		{
>+			GLib.Timeout.Add (0, new GLib.TimeoutHandler (delegate {
>+				GLib.Signal.Emit (this, name, o);
>+				return false;
>+			}));
>+		}
>+
>+		internal void EmitSignal (string name, object o1, object o2)
>+		{
>+			GLib.Timeout.Add (0, new GLib.TimeoutHandler (delegate {
>+				GLib.Signal.Emit (this, name, o1, o2);
>+				return false;
>+			}));
>+		}
>+
>+		internal void EmitSelectionChanged ()
>+		{
>+			GLib.Timeout.Add (0, new GLib.TimeoutHandler (delegate {
>+				GLib.Signal.Emit (this, "selection_changed");
>+				return false;
>+			}));
>+		}
>+
>+		internal new void EmitVisibleDataChanged ()
>+		{
>+			GLib.Timeout.Add (0, new GLib.TimeoutHandler (delegate {
>+				base.EmitVisibleDataChanged ();
>+				return false;
>+			}));
>+		}
>+
>+		// Unfortunately, we can't just override atk's set name/parent/
>+		// role, since atk calls g_object_notify, which must be called
>+		// in the glib thread.
>+		public new Atk.Object Parent {
>+			get {
>+				return parent;
>+			}
>+			set {
>+				parent = value;
>+				GLib.Timeout.Add (0, new GLib.TimeoutHandler (delegate {
>+					base.Parent = value;
>+					return false;
>+				}));
>+			}
>+		}
>+
>+		protected override Atk.Object OnGetParent ()
>+		{
>+			return parent;
>+		}
>+
>+		protected static void SetParent (Atk.Object child, Atk.Object newParent)
>+		{
>+			if (child is Adapter)
>+				((Adapter)child).Parent = newParent;
>+			else
>+				child.Parent = newParent;
>+		}
>+
>+		protected static Atk.Object GetParent (Atk.Object child)
>+		{
>+			if (child is Adapter)
>+				return ((Adapter)child).Parent;
>+			else
>+				return child.Parent;
>+		}
>+
>+		public new string Name {
>+			get {
>+				return name;
>+			}
>+			set {
>+				name = value;
>+				GLib.Timeout.Add (0, new GLib.TimeoutHandler (delegate {
>+					base.Name = value;
>+					return false;
>+				}));
>+			}
>+		}
>+
>+		protected override string OnGetName ()
>+		{
>+			return name;
>+		}
>+
>+		public new Atk.Role Role {
>+			get {
>+				return role;
>+			}
>+			set {
>+				role = value;
>+				GLib.Timeout.Add (0, new GLib.TimeoutHandler (delegate {
>+					base.Role = value;
>+					return false;
>+				}));
>+			}
>+		}
>+
>+		protected override Atk.Role OnGetRole ()
>+		{
>+			return role;
>+		}
>+
> 		protected void NotifyFocused (bool focused)
> 		{
> 			NotifyStateChange (Atk.StateType.Focused, focused);
>@@ -72,8 +193,12 @@
> 				}
> 			}
> 
>-			if (focused)
>-				Atk.Focus.TrackerNotify (this);
>+			if (focused) {
>+				GLib.Timeout.Add (0, new GLib.TimeoutHandler (delegate {
>+					Atk.Focus.TrackerNotify (this);
>+					return false;
>+				}));
>+			}
> 			if (focusWindow != null)
> 				focusWindow.SendActiveStateChange ();
> 		}
>@@ -100,7 +225,7 @@
> 					Log.Error ("Parent of an object should not be null");
> 					return;
> 				}
>-				parent = parent.Parent;
>+				parent = GetParent (parent);
> 			}
> 			TopLevelRootItem.Instance.CheckAndHandleNewActiveWindow ((UiaAtkBridge.Window)parent);
> 		}
>@@ -147,8 +272,10 @@
> 			if (parent == Parent)
> 				Parent = null;
> 
>-			if (terminate)
>+			if (terminate && !defunct) {
> 				defunct = true;
>+				NotifyStateChange (Atk.StateType.Defunct, true);
>+			}
> 		}
> 		
> 		internal virtual void PostInit ()
>@@ -291,6 +418,9 @@
> #endregion
> 
> #region Private Fields
>+		private Atk.Object parent;
>+		private Atk.Role role;
>+		private string name;
> 		private bool defunct = false;
> #endregion
> 
>@@ -344,7 +474,7 @@
> 			atkRect.Y = (int)rect.Y;
> 			atkRect.Width = (int)rect.Width;
> 			atkRect.Height = (int)rect.Height;
>-			GLib.Signal.Emit (this, "bounds_changed", atkRect);
>+			EmitSignal ("bounds_changed", atkRect);
> 		}
> 	}
> }
>Index: /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/AutomationBridge.cs
>===================================================================
>--- /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/AutomationBridge.cs	(revision 138881)
>+++ /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/AutomationBridge.cs	(working copy)
>@@ -734,8 +734,8 @@
> 			} else if (controlTypeId == ControlType.Window.Id) {
> 				// We should do the following, but it would
> 				// reintroduce bug 427857.
>-				//GLib.Signal.Emit (adapter, "deactivate");
>-				//GLib.Signal.Emit (adapter, "destroy");
>+				//Adapter.EmitSignal ("deactivate");
>+				//Adapter.EmitSignal ("destroy");
> 				TopLevelRootItem.Instance.RemoveChild (adapter);
> 				windowProviders--;
> 				if (windowProviders == 0)
>@@ -850,6 +850,9 @@
> 
> 		private static void HandleNewWindowControlType (IRawElementProviderSimple provider)
> 		{
>+			// make sure we have a main loop.  We may not, ie, if
>+			// a form has already been created and then destroyed.
>+			Monitor.Instance.CheckMainLoop ();
> 			var newWindow = CreateAdapter<Window> (provider);
> 
> 			if (newWindow == null)
>@@ -860,7 +863,7 @@
> 			IntPtr providerHandle = (IntPtr) provider.GetPropertyValue (AutomationElementIdentifiers.NativeWindowHandleProperty.Id);
> 			pointerProviderMapping [providerHandle] = provider;
> 
>-			GLib.Signal.Emit (newWindow, "create");
>+			newWindow.EmitSignal ("create");
> 			
> 			windowProviders++;
> 		}
>Index: /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/BaseTextImplementor.cs
>===================================================================
>--- /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/BaseTextImplementor.cs	(revision 138881)
>+++ /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/BaseTextImplementor.cs	(working copy)
>@@ -303,7 +303,9 @@
> 
> 		public string GetText (int startOffset, int endOffset)
> 		{
>-			string text = (deleteHack != null? deleteHack: Text);
>+			if (cachedText != null && cachedTextStart == startOffset && cachedTextEnd == endOffset)
>+				return cachedText;
>+			string text = Text;
> 			if ((endOffset == -1) || (endOffset > text.Length))
> 				endOffset = text.Length;
> 			if (endOffset < startOffset)
>@@ -377,11 +379,10 @@
> 			int offset;
> 			if (newLength > oldLength) {
> 				if (IsAddition (text, oldText, out offset)) {
>-					Atk.TextAdapter adapter = new Atk.TextAdapter ((Atk.TextImplementor)resource);
>-					adapter.EmitTextChanged (Atk.TextChangedDetail.Insert, offset, newLength - oldLength);
>+					EmitTextChanged (Atk.TextChangedDetail.Insert, offset, newLength - oldLength);
> 					if (updateCaret) {
> 						caretOffset = offset + (newLength - oldLength);
>-						GLib.Signal.Emit (resource, "text_caret_moved", caretOffset);
>+						resource.EmitSignal ("text_caret_moved", caretOffset);
> 					}
> 					oldText = text;
> 					return true;
>@@ -389,15 +390,12 @@
> 			}
> 			else if (oldLength > newLength) {
> 				if (IsAddition (oldText, text, out offset)) {
>-					Atk.TextAdapter adapter = new Atk.TextAdapter ((Atk.TextImplementor)resource);
> 					// Atk-bridge expects the text not to
> 					// have been deleted yet
>-					deleteHack = oldText;
>-					adapter.EmitTextChanged (Atk.TextChangedDetail.Delete, offset, oldLength - newLength);
>-					deleteHack = null;
>+					EmitTextChanged (Atk.TextChangedDetail.Delete, offset, oldLength - newLength, oldText);
> 					if (updateCaret) {
> 						caretOffset = offset;
>-						GLib.Signal.Emit (resource, "text_caret_moved", caretOffset);
>+						resource.EmitSignal ("text_caret_moved", caretOffset);
> 					}
> 					oldText = text;
> 					return true;
>@@ -435,13 +433,33 @@
> 				int newCaretOffset = caretProvider.CaretOffset;
> 				if (newCaretOffset != caretOffset) {
> 					caretOffset = newCaretOffset;
>-					GLib.Signal.Emit (resource, "text_caret_moved", caretOffset);
>+					resource.EmitSignal ("text_caret_moved", caretOffset);
> 				}
> 				return true;
> 			}
> 				
> 			return false;
> 		}
>+
>+		public void EmitTextChanged (Atk.TextChangedDetail detail, int position, int length)
>+		{
>+			EmitTextChanged (detail, position, length, null);
>+		}
>+
>+		public void EmitTextChanged (Atk.TextChangedDetail detail, int position, int length, string curText)
>+		{
>+			if (curText == null)
>+				curText = Text;
>+			GLib.Timeout.Add (0, new GLib.TimeoutHandler (delegate {
>+				cachedText = curText.Substring (position, length);
>+				cachedTextStart = position;
>+				cachedTextEnd = position + length;
>+				GLib.Signal.Emit (resource, "text_changed::" + detail.ToString ().ToLower (),
>+					position, length);
>+				cachedText = null;
>+				return false;
>+			}));
>+		}
> #endregion
> 
> #region Protected Fields
>@@ -633,7 +651,9 @@
> 
> 		private ICaretProvider caretProvider;
> 		private int caretOffset;
>-		private string deleteHack = null;
>+		private string cachedText = null;
>+		private int cachedTextStart = 0;
>+		private int cachedTextEnd = 0;
> #endregion
> 	}
> }
>Index: /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/Button.cs
>===================================================================
>--- /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/Button.cs	(revision 138881)
>+++ /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/Button.cs	(working copy)
>@@ -234,12 +234,10 @@
> 			if (fromCtor)
> 				return;
> 
>-			Atk.TextAdapter adapter = new Atk.TextAdapter (this);
>-
> 			// First delete all text, then insert the new text
>-			adapter.EmitTextChanged (Atk.TextChangedDetail.Delete, 0, textExpert.Length);
>+			textExpert.EmitTextChanged (Atk.TextChangedDetail.Delete, 0, textExpert.Length);
> 
>-			adapter.EmitTextChanged (Atk.TextChangedDetail.Insert, 0,
>+			textExpert.EmitTextChanged (Atk.TextChangedDetail.Insert, 0,
> 						 newName == null ? 0 : newName.Length);
> 			EmitVisibleDataChanged ();
> 		}
>Index: /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/ComboBox.cs
>===================================================================
>--- /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/ComboBox.cs	(revision 138881)
>+++ /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/ComboBox.cs	(working copy)
>@@ -167,7 +167,7 @@
> 				name = String.Empty;
> 			
> 			Name = name;
>-			GLib.Signal.Emit (this, "selection-changed");
>+			EmitSelectionChanged ();
> 		}
> 		
> 		public override void RaiseAutomationEvent (AutomationEvent eventId, AutomationEventArgs e)
>Index: /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/DataGrid.cs
>===================================================================
>--- /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/DataGrid.cs	(revision 138881)
>+++ /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/DataGrid.cs	(working copy)
>@@ -53,7 +53,7 @@
> 					Atk.Focus.TrackerNotify (this);
> 			}
> 			if (itemFocused)
>-				GLib.Signal.Emit (this, "active-descendant-changed", item.Handle);
>+				EmitSignal ("active-descendant-changed", item.Handle);
> 			hasFocus = tableFocused;
> 		}
> 
>Index: /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/EditableTextImplementorHelper.cs
>===================================================================
>--- /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/EditableTextImplementorHelper.cs	(revision 138881)
>+++ /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/EditableTextImplementorHelper.cs	(working copy)
>@@ -35,16 +35,15 @@
> 	internal class EditableTextImplementorHelper
> 	{
> 		
>-		public EditableTextImplementorHelper (Adapter adapter, Atk.TextImplementor textImplementor)
>+		public EditableTextImplementorHelper (Adapter adapter, Atk.TextImplementor textImplementor, ITextImplementor textExpert)
> 		{
> 			this.adapter = adapter;
>-			this.textImplementor = textImplementor;
> 
> 			valueProvider 
> 				= adapter.Provider.GetPatternProvider (ValuePatternIdentifiers.Pattern.Id)
> 					as IValueProvider;
> 
>-			textExpert = TextImplementorFactory.GetImplementor (adapter, adapter.Provider);
>+			this.textExpert = textExpert;
> 
> 			if (valueProvider != null)
> 				editable = !valueProvider.IsReadOnly;
>@@ -251,24 +250,24 @@
> 				                                   false))
> 					return true;
> 
>-				Atk.TextAdapter textAdapter = new Atk.TextAdapter (textImplementor);
> 				string newText = textExpert.Text;
> 
> 				// First delete all text, then insert the new text
>-				textAdapter.EmitTextChanged (Atk.TextChangedDetail.Delete, 
>-				                             0, 
>-				                             oldText.Length);
>-
>-				textAdapter.EmitTextChanged (Atk.TextChangedDetail.Insert, 
>-				                             0,
>-				                             newText == null ? 0 : newText.Length);
>+				textExpert.EmitTextChanged (Atk.TextChangedDetail.Delete, 
>+				                            0, 
>+				                            oldText.Length,
>+				                            oldText);
>+
>+				textExpert.EmitTextChanged (Atk.TextChangedDetail.Insert, 
>+				                            0,
>+				                            newText == null ? 0 : newText.Length);
> 
> 				if (caretProvider == null)
> 					caretOffset = textExpert.Length;
> 
> 				oldText = newText;
> 
>-				GLib.Signal.Emit (adapter, "visible-data-changed");
>+				adapter.EmitVisibleDataChanged ();
> 
> 				return true;
> 			} else if (e.Property.Id == ValuePatternIdentifiers.IsReadOnlyProperty.Id) {
>@@ -293,7 +292,7 @@
> 
> 				return true;
> 			} else if (eventId == TextPatternIdentifiers.TextSelectionChangedEvent) {
>-				GLib.Signal.Emit (adapter, "text_selection_changed");
>+				adapter.EmitSignal ("text_selection_changed");
> 				return true;
> 			} 
> 			
>@@ -320,7 +319,6 @@
> 		private bool editable;
> 		private string oldText;
> 		private ITextImplementor textExpert;		
>-		private Atk.TextImplementor textImplementor;
> 		private IValueProvider valueProvider;
> 		private IInsertDeleteTextProvider insertDeleteProvider;
> 
>Index: /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/Hyperlink.cs
>===================================================================
>--- /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/Hyperlink.cs	(revision 138881)
>+++ /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/Hyperlink.cs	(working copy)
>@@ -100,12 +100,10 @@
> 					return;
> 				}
> 
>-				Atk.TextAdapter adapter = new Atk.TextAdapter (this);
>-
> 				// First delete all text, then insert the new text
>-				adapter.EmitTextChanged (Atk.TextChangedDetail.Delete, 0, textExpert.Length);
>+				textExpert.EmitTextChanged (Atk.TextChangedDetail.Delete, 0, textExpert.Length);
> 
>-				adapter.EmitTextChanged (Atk.TextChangedDetail.Insert, 0,
>+				textExpert.EmitTextChanged (Atk.TextChangedDetail.Insert, 0,
> 				                         newText == null ? 0 : newText.Length);
> 
> 				// Accessible name and label text are one and
>Index: /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/ITextImplementor.cs
>===================================================================
>--- /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/ITextImplementor.cs	(revision 138881)
>+++ /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/ITextImplementor.cs	(working copy)
>@@ -82,5 +82,7 @@
> 
> 		bool RaiseAutomationEvent (AutomationEvent eventId, AutomationEventArgs e);
> 		bool RaiseAutomationPropertyChangedEvent (AutomationPropertyChangedEventArgs e);
>+		void EmitTextChanged (Atk.TextChangedDetail detail, int position, int length);
>+		void EmitTextChanged (Atk.TextChangedDetail detail, int position, int length, string curText);
> 	}
> }
>Index: /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/List.cs
>===================================================================
>--- /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/List.cs	(revision 138881)
>+++ /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/List.cs	(working copy)
>@@ -189,7 +189,7 @@
> 					Atk.Focus.TrackerNotify (this);
> 			}
> 			if (itemFocused)
>-				GLib.Signal.Emit (this, "active-descendant-changed", item.Handle);
>+				EmitSignal ("active-descendant-changed", item.Handle);
> 			hasFocus = listFocused;
> 		}
> 
>@@ -294,8 +294,8 @@
> 				throw new ArgumentException ("Provider does not implement IValue");
> 			}
> 
>-			editableTextExpert = new EditableTextImplementorHelper (this, this);
> 			text_helper = TextImplementorFactory.GetImplementor (this, provider);
>+			editableTextExpert = new EditableTextImplementorHelper (this, this, text_helper);
> 		}
> 
> 		protected override Atk.StateSet OnRefStateSet ()
>Index: /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/ListItem.cs
>===================================================================
>--- /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/ListItem.cs	(revision 138881)
>+++ /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/ListItem.cs	(working copy)
>@@ -54,7 +54,7 @@
> 			textExpert = TextImplementorFactory.GetImplementor (this, provider);
> 			imageExpert = new ImageImplementorHelper (this);
> 			actionExpert = new ActionImplementorHelper ();
>-			editableTextExpert = new EditableTextImplementorHelper (this, this);
>+			editableTextExpert = new EditableTextImplementorHelper (this, this, textExpert);
> 
> 			// TODO: Localize the name?s
> 			actionExpert.Add ("click", "click", null, DoClick);
>@@ -182,12 +182,12 @@
> 				if (list != null)
> 					list.NotifyItemSelected (this);
> 				else
>-				NotifyStateChange ((ulong) Atk.StateType.Selected, true);
>+				NotifyStateChange (Atk.StateType.Selected, true);
> 			}
> 			else if (eventId == SelectionItemPatternIdentifiers.ElementAddedToSelectionEvent)
>-				NotifyStateChange ((ulong) Atk.StateType.Selected, true);
>+				NotifyStateChange (Atk.StateType.Selected, true);
> 			else if (eventId == SelectionItemPatternIdentifiers.ElementRemovedFromSelectionEvent)
>-				NotifyStateChange ((ulong) Atk.StateType.Selected, false);
>+				NotifyStateChange (Atk.StateType.Selected, false);
> 		}
> 		
> 		public int CaretOffset {
>Index: /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/Menu.cs
>===================================================================
>--- /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/Menu.cs	(revision 138881)
>+++ /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/Menu.cs	(working copy)
>@@ -147,11 +147,10 @@
> 				if (changed_selected_child) {
> 					Atk.SelectionImplementor selImplementor = this as Atk.SelectionImplementor;
> 					if (selImplementor != null) {
>-						var sel_adapter = new Atk.SelectionAdapter (selImplementor);
> 						if (any_child_was_selected)
> 							//2 times: because we deselect a child and select another one
>-							sel_adapter.EmitSelectionChanged ();
>-						sel_adapter.EmitSelectionChanged ();
>+							EmitSelectionChanged ();
>+						EmitSelectionChanged ();
> 					}
> 				}
> 			}
>Index: /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/Monitor.cs
>===================================================================
>--- /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/Monitor.cs	(revision 138881)
>+++ /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/Monitor.cs	(working copy)
>@@ -124,9 +124,7 @@
> 				return;
> 			}
> 
>-			Thread glibThread = new Thread (new ThreadStart (GLibMainLoopThread));
>-			glibThread.IsBackground = true;
>-			glibThread.Start ();
>+			CheckMainLoop ();
> 			AutoResetEvent sync = GLibHacks.Invoke (delegate (object sender, EventArgs args) {
> 				Environment.SetEnvironmentVariable (ATK_BRIDGE_ENVVAR_NAME, null);
> 				LaunchAtkBridge ();
>@@ -139,6 +137,16 @@
> 			Environment.SetEnvironmentVariable (GTK_MODULES_ENVVAR_NAME, gtk_modules_envvar_content);
> 		}
> 		
>+		public void CheckMainLoop ()
>+		{
>+			if (mainLoop != null && mainLoop.IsRunning)
>+				return;
>+
>+			Thread glibThread = new Thread (new ThreadStart (GLibMainLoopThread));
>+			glibThread.IsBackground = true;
>+			glibThread.Start ();
>+		}
>+
> 		private void GLibMainLoopThread ()
> 		{
> 			mainLoop = new GLib.MainLoop ();
>@@ -159,7 +167,10 @@
> 			AutoResetEvent sync = GLibHacks.Invoke (delegate (object sender, EventArgs args) {
> 				ShutdownAtkBridge ();
> 				Atk.Util.GetRootHandler = null;
>-				mainLoop.Quit ();
>+				// Not going to quit--causes problems with
>+				// ORBit if we re-create a window (ie, the
>+				// dialog bridge tests).  The thread is
>+				// backgrounded, so should die with the app.
> 			});
> 			sync.WaitOne ();
> 			sync.Close ();
>Index: /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/ParentAdapter.cs
>===================================================================
>--- /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/ParentAdapter.cs	(revision 138881)
>+++ /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/ParentAdapter.cs	(working copy)
>@@ -98,7 +98,7 @@
> 			}
> 			//we may want that a child has 2 parents
> 			if (child.Parent == null)
>-				child.Parent = this;
>+				SetParent (child, this);
> 			EmitChildrenChanged (Atk.Object.ChildrenChangedDetail.Add, (uint)(children.Count - 1), child);
> 			Adapter adapter = child as Adapter;
> 			if (adapter != null)
>@@ -169,6 +169,15 @@
> 				RequestChildren ();
> 			}
> 		}
>+
>+		protected new void EmitChildrenChanged (ChildrenChangedDetail detail, uint child_index, Atk.Object child)
>+		{
>+			GLib.Timeout.Add (0, new GLib.TimeoutHandler (delegate {
>+			base.EmitChildrenChanged (detail, child_index, child);
>+				return false;
>+			}));
>+		}
>+			
> #endregion
> 
> 		public override void RaiseAutomationEvent (AutomationEvent eventId, AutomationEventArgs args)
>Index: /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/Slider.cs
>===================================================================
>--- /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/Slider.cs	(revision 138881)
>+++ /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/Slider.cs	(working copy)
>@@ -236,12 +236,10 @@
> 			if (textExpert.HandleSimpleChange (ref oldText, ref caretOffset))
> 				return;
> 
>-			Atk.TextAdapter adapter = new Atk.TextAdapter (this);
>-
> 			// First delete all text, then insert the new text
>-			adapter.EmitTextChanged (Atk.TextChangedDetail.Delete, 0, oldText.Length);
>+			textExpert.EmitTextChanged (Atk.TextChangedDetail.Delete, 0, oldText.Length, oldText);
> 
>-			adapter.EmitTextChanged (Atk.TextChangedDetail.Insert, 0,
>+			textExpert.EmitTextChanged (Atk.TextChangedDetail.Insert, 0,
> 				                 newText == null ? 0 : newText.Length);
> 			oldText = newText;
> 		}
>Index: /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/Spinner.cs
>===================================================================
>--- /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/Spinner.cs	(revision 138881)
>+++ /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/Spinner.cs	(working copy)
>@@ -287,12 +287,10 @@
> 			if (textExpert.HandleSimpleChange (ref oldText, ref caretOffset))
> 				return;
> 
>-			Atk.TextAdapter adapter = new Atk.TextAdapter (this);
>-
> 			// First delete all text, then insert the new text
>-			adapter.EmitTextChanged (Atk.TextChangedDetail.Delete, 0, oldText.Length);
>+			textExpert.EmitTextChanged (Atk.TextChangedDetail.Delete, 0, oldText.Length, oldText);
> 
>-			adapter.EmitTextChanged (Atk.TextChangedDetail.Insert, 0,
>+			textExpert.EmitTextChanged (Atk.TextChangedDetail.Insert, 0,
> 				                 newText == null ? 0 : newText.Length);
> 			oldText = newText;
> 		}
>Index: /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/Tab.cs
>===================================================================
>--- /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/Tab.cs	(revision 138881)
>+++ /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/Tab.cs	(working copy)
>@@ -61,7 +61,7 @@
> 		public override void RaiseAutomationPropertyChangedEvent (AutomationPropertyChangedEventArgs e)
> 		{
> 			if (e.Property == SelectionPatternIdentifiers.SelectionProperty) {
>-				GLib.Signal.Emit (this, "selection_changed");
>+				EmitSignal ("selection_changed");
> 				EmitVisibleDataChanged ();
> 			} else
> 				base.RaiseAutomationPropertyChangedEvent (e);
>Index: /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/Table.cs
>===================================================================
>--- /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/Table.cs	(revision 138881)
>+++ /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/Table.cs	(working copy)
>@@ -43,7 +43,7 @@
> 		public override void RaiseAutomationEvent (AutomationEvent eventId, AutomationEventArgs e)
> 		{
> 			if (eventId == GridPatternIdentifiers.ColumnReorderedEvent)
>-				GLib.Signal.Emit (this, "column_reordered");
>+				EmitSignal ("column_reordered");
> 			else
> 				base.RaiseAutomationEvent (eventId, e);
> 			// TODO
>@@ -214,8 +214,8 @@
> 
> 		internal void EmitRowReorderingSignal ()
> 		{
>-			GLib.Signal.Emit (this, "row-reordered");
>-			GLib.Signal.Emit (this, "visible-data-changed");
>+			EmitSignal ("row-reordered");
>+			EmitVisibleDataChanged ();
> 		}
> 
> 		protected override Atk.StateSet OnRefStateSet ()
>Index: /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/TextBoxEntryView.cs
>===================================================================
>--- /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/TextBoxEntryView.cs	(revision 138881)
>+++ /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/TextBoxEntryView.cs	(working copy)
>@@ -51,8 +51,6 @@
> 			else
> 				Role = Atk.Role.Text;
> 
>-			editableTextExpert = new EditableTextImplementorHelper (this, this);
>-
> 			if (provider.GetPatternProvider (TextPatternIdentifiers.Pattern.Id) == null
> 			    && provider.GetPatternProvider (ValuePatternIdentifiers.Pattern.Id) == null)
> 				throw new ArgumentException ("Provider for TextBox should either implement IValue or IText");
>@@ -61,6 +59,8 @@
> 			if ((int) provider.GetPropertyValue (AutomationElementIdentifiers.ControlTypeProperty.Id) 
> 			    == ControlType.Document.Id)
> 				multiLine = true;
>+
>+			editableTextExpert = new EditableTextImplementorHelper (this, this, textExpert);
> 		}
> 
> 		protected bool IsTableCell {
>Index: /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/TextContainer.cs
>===================================================================
>--- /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/TextContainer.cs	(revision 138881)
>+++ /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/TextContainer.cs	(working copy)
>@@ -172,12 +172,10 @@
> 			if (fromCtor)
> 				return;
> 
>-			Atk.TextAdapter adapter = new Atk.TextAdapter (this);
>-
> 			// First delete all text, then insert the new text
>-			adapter.EmitTextChanged (Atk.TextChangedDetail.Delete, 0, textExpert.Length);
>+		textExpert.EmitTextChanged (Atk.TextChangedDetail.Delete, 0, textExpert.Length);
> 
>-			adapter.EmitTextChanged (Atk.TextChangedDetail.Insert, 0,
>+			textExpert.EmitTextChanged (Atk.TextChangedDetail.Insert, 0,
> 						 newName == null ? 0 : newName.Length);
> 
> 			EmitVisibleDataChanged ();
>Index: /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/TextLabel.cs
>===================================================================
>--- /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/TextLabel.cs	(revision 138881)
>+++ /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/TextLabel.cs	(working copy)
>@@ -80,12 +80,10 @@
> 			if (fromCtor)
> 				return;
> 
>-			Atk.TextAdapter adapter = new Atk.TextAdapter (this);
>-
> 			// First delete all text, then insert the new text
>-			adapter.EmitTextChanged (Atk.TextChangedDetail.Delete, 0, textExpert.Length);
>+			textExpert.EmitTextChanged (Atk.TextChangedDetail.Delete, 0, textExpert.Length);
> 
>-			adapter.EmitTextChanged (Atk.TextChangedDetail.Insert, 0,
>+			textExpert.EmitTextChanged (Atk.TextChangedDetail.Insert, 0,
> 						 newName == null ? 0 : newName.Length);
> 
> 			EmitVisibleDataChanged ();
>Index: /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/Tree.cs
>===================================================================
>--- /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/Tree.cs	(revision 138881)
>+++ /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/Tree.cs	(working copy)
>@@ -214,7 +214,7 @@
> 				// it is excessively verbose.
> 				if (!CanSelectMultiple)
> 					NotifyItemSelected (item);
>-				GLib.Signal.Emit (this, "active-descendant-changed", item.Handle);
>+				EmitSignal ("active-descendant-changed", item.Handle);
> 			}
> 			hasFocus = listFocused;
> 		}
>@@ -419,7 +419,7 @@
> 				if (IsListItem (child))
> 					rowCount++;
> 			if (rowCount > 0) {
>-				GLib.Signal.Emit (this, (expanded? "row-inserted": "row-deleted"), row + 1, rowCount);
>+				EmitSignal ((expanded? "row-inserted": "row-deleted"), row + 1, rowCount);
> 				EmitVisibleDataChanged ();
> 			}
> 		}
>Index: /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/TreeItem.cs
>===================================================================
>--- /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/TreeItem.cs	(revision 138881)
>+++ /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/TreeItem.cs	(working copy)
>@@ -72,7 +72,7 @@
> 			Role = (ToggleProvider != null? Atk.Role.CheckBox: Atk.Role.TableCell);
> 
> 			imageExpert = new ImageImplementorHelper (this);
>-			editableTextExpert = new EditableTextImplementorHelper (this, this);
>+			editableTextExpert = new EditableTextImplementorHelper (this, this, textExpert);
> 		}
> 		
> 		protected IToggleProvider ToggleProvider {
>@@ -216,12 +216,12 @@
> 				if (list != null)
> 					list.NotifyItemSelected (this);
> 				else
>-				NotifyStateChange ((ulong) Atk.StateType.Selected, true);
>+				NotifyStateChange (Atk.StateType.Selected, true);
> 			}
> 			else if (eventId == SelectionItemPatternIdentifiers.ElementAddedToSelectionEvent)
>-				NotifyStateChange ((ulong) Atk.StateType.Selected, true);
>+				NotifyStateChange (Atk.StateType.Selected, true);
> 			else if (eventId == SelectionItemPatternIdentifiers.ElementRemovedFromSelectionEvent) {
>-				NotifyStateChange ((ulong) Atk.StateType.Selected, false);
>+				NotifyStateChange (Atk.StateType.Selected, false);
> 				Tree list = Parent as Tree;
> 				if (list != null)
> 					list.NotifyItemSelectionRemoved (this);
>Index: /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/Window.cs
>===================================================================
>--- /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/Window.cs	(revision 138881)
>+++ /trunk/uia2atk/UiaAtkBridge/UiaAtkBridge/Window.cs	(working copy)
>@@ -116,19 +116,19 @@
> 				WindowVisualState newValue = (WindowVisualState) e.NewValue;
> 				
> 				if (newValue == WindowVisualState.Maximized)
>-					GLib.Signal.Emit (this, "maximize");
>+					EmitSignal ("maximize");
> 				else if (newValue == WindowVisualState.Minimized)
>-					GLib.Signal.Emit (this, "minimize");
>+					EmitSignal ("minimize");
> 				else // Back to Normal, so is Restored
>-					GLib.Signal.Emit (this, "restore");
>+					EmitSignal ("restore");
> 			} else if (e.Property == AutomationElementIdentifiers.BoundingRectangleProperty) {
> 				Rect oldValue = (Rect) e.OldValue;
> 				Rect newValue = (Rect) e.NewValue;
> 				
> 				if (oldValue.X != newValue.X || oldValue.Y != newValue.Y)
>-					GLib.Signal.Emit (this, "move");
>+					EmitSignal ("move");
> 				if (oldValue.Width != newValue.Width || oldValue.Height != newValue.Height)
>-					GLib.Signal.Emit (this, "resize");
>+					EmitSignal ("resize");
> 
> 				base.RaiseAutomationPropertyChangedEvent (e);
> 			} else
>@@ -203,7 +203,7 @@
> 						continue;
> 					}
> 					RemoveChild (obj, false);
>-					obj.Parent = child;
>+					SetParent (obj, child);
> 					splitter.AddOneChild (obj);
> 					count--;
> 				}
>@@ -221,7 +221,7 @@
> 				while (count > 0) {
> 					Atk.Object obj = parentAdapter.RefAccessibleChild (0);
> 					parentAdapter.RemoveChild (obj, false);
>-					obj.Parent = this;
>+					SetParent (obj, this);
> 					AddOneChild (obj);
> 					count--;
> 				}
>@@ -235,7 +235,7 @@
> 				return;
> 			this.active = active;
> 			if (active)
>-				GLib.Signal.Emit (this, "activate");
>+				EmitSignal ("activate");
> 			needStateChange = true;
> 		}
>

Actions: View

Attachments on bug 515507: 304997 | 345288