Attachment 308665 Details for Bug 457845

[patch] Updated patch against uia2atk

names.diff (text/plain), 45.68 KB, created by Andres Aragoneses on 2009-07-28 22:06:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andres Aragoneses

Created: 2009-07-28 22:06:46 UTC

Size: 45.68 KB

patch

obsolete

>Index: test/samples/button_label_linklabel.py
>===================================================================
>--- test/samples/button_label_linklabel.py	(revision 138882)
>+++ test/samples/button_label_linklabel.py	(working copy)
>@@ -119,7 +119,7 @@
>         self.Controls.Add(self.insensitive_label)
>     
>     def button1_click(self, sender, event):
>-        MessageBox.Show("successful clicked me", "message")
>+        self.button2.AccessibleName = "new accessible name"
> 
>     def change_message(self, sender, event):
>         self.count += 1
>Index: UiaAtkBridge/Test/AtkTest/AtkTests.cs
>===================================================================
>--- UiaAtkBridge/Test/AtkTest/AtkTests.cs	(revision 138882)
>+++ UiaAtkBridge/Test/AtkTest/AtkTests.cs	(working copy)
>@@ -45,6 +45,8 @@
> 			Atk.Object accessible = InterfaceText (type,
> 				(type == BasicWidgetType.ToolStripLabel));
> 			Label (accessible, type);
>+
>+			TestNewAccessibleName (accessible);
> 		}
> 
> 		protected void Label (Atk.Object accessible, BasicWidgetType type)
>@@ -63,6 +65,8 @@
> 			
> 			//TODO: check parent (it seems it only works for real objects)
> 			//Assert.IsNotNull (accessible.Parent, "Label parent");
>+
>+			TestNewAccessibleName (accessible);
> 		}
> 		
> 		[Test]
>@@ -117,6 +121,8 @@
> 			string keyBinding = atkAction.GetKeybinding (0);
> 			Assert.IsNotNull (keyBinding, "GetKeybinding (0))");
> 			Assert.AreEqual (keyBinding, "<Alt>e", "<Alt>e");
>+
>+			TestNewAccessibleName (accessible);
> 		}
> 
> 		[Test]
>@@ -165,6 +171,8 @@
> 			string keyBinding = atkAction.GetKeybinding (0);
> 			Assert.IsNotNull (keyBinding, "GetKeybinding (0))");
> 			Assert.AreEqual (keyBinding, "<Alt>s", "<Alt>s");
>+
>+			TestNewAccessibleName (accessible);
> 		}
> 		
> 		[Test]
>@@ -225,6 +233,8 @@
> 			string keyBinding = atkAction.GetKeybinding (0);
> 			Assert.IsNotNull (keyBinding, "GetKeybinding (0))");
> 			Assert.AreEqual (keyBinding, "<Alt>t", "<Alt>t");
>+
>+			TestNewAccessibleName (accessible);
> 		}
> 		
> 		[Test]
>@@ -245,22 +255,35 @@
> 			InterfaceComponent (type, atkComponent);
> 
> 			Parent (type, accessible);
>+
>+			TestNewAccessibleName (accessible);
> 		}
> 		
> 		[Test]
> 		public void HScrollBar ()
> 		{
> 			BasicWidgetType type = BasicWidgetType.HScrollBar;
>-			Atk.Object accessible;
>-			string name = "test";
>+			Atk.Object accessible = null, orig;
>+			string [] names = new string [] { "First item", "Second Item", "Last Item", 
>+			  "A really, really long item that's here to try to ensure that we have a scrollbar, assuming that it's even possible to have a scrollbar just by having a relaly, really long item and we don't also have to perform some other function which I'm not aware of, like display the form on the screen" };
>+			
>+			orig = GetAccessible (type, names, true);
> 
>-			accessible = GetAccessible (type, name, true);
>+			for (int i = orig.NAccessibleChildren - 1; i >= 0; i--)
>+			{
>+				Atk.Object child = orig.RefAccessibleChild (i);
>+				if (child.Role == Atk.Role.ScrollBar && child.RefStateSet().ContainsState(Atk.StateType.Horizontal))
>+				{
>+					accessible = child;
>+					break;
>+				}
>+			}
>+			PropertyRole (type, accessible);
>+			
> 			Atk.Value atkValue = CastToAtkInterface <Atk.Value> (accessible);
> 			
> 			InterfaceValue (type, atkValue);
> 
>-			PropertyRole (type, accessible);
>-
> 			States (accessible,
> 				Atk.StateType.Horizontal,
> 				Atk.StateType.Enabled,
>@@ -308,23 +331,37 @@
> 				Assert.AreEqual (minimumValue,
> 				                 (double) glibValue.Val, "Set/Get values failed. (Maximum + 1)");
> 			}
>+
>+			TestNewAccessibleName (orig);
> 		}
> 		
> 		[Test]
> 		public void VScrollBar ()
> 		{
> 			BasicWidgetType type = BasicWidgetType.VScrollBar;
>-			Atk.Object accessible;
>-			string name = "test";
>+			Atk.Object accessible = null, orig;
>+			string [] names = new string [100];
>+			for (int i = 0; i < 100; i++)
>+				names [i] = i.ToString ();
> 
>-			accessible = GetAccessible (type, name, true);
>+			orig = GetAccessible (type, names, true);
> 			
>+			for (int i = orig.NAccessibleChildren - 1; i >= 0; i--)
>+			{
>+				Atk.Object child = orig.RefAccessibleChild (i);
>+				if (child.Role == Atk.Role.ScrollBar && child.RefStateSet ().ContainsState (Atk.StateType.Vertical))
>+				{
>+					accessible = child;
>+					break;
>+				}
>+			}
>+			
>+			PropertyRole (type, accessible);
>+			
> 			Atk.Value atkValue = CastToAtkInterface <Atk.Value> (accessible);
> 			
> 			InterfaceValue (type, atkValue);
>-
>-			PropertyRole (type, accessible);
>-
>+			
> 			States (accessible,
> 				Atk.StateType.Vertical,
> 				Atk.StateType.Enabled,
>@@ -335,7 +372,6 @@
> 			Assert.AreEqual (ValidNChildrenForAScrollBar, accessible.NAccessibleChildren, "VScrollBar numChildren");
> 
> 			Atk.Component atkComponent = CastToAtkInterface <Atk.Component> (accessible);
>-
> 			InterfaceComponent (type, atkComponent);
> 
> 			//Simple Set/Get
>@@ -371,6 +407,8 @@
> 				Assert.AreEqual (minimumValue,
> 				                 (double) glibValue.Val, "Set/Get values failed. (Maximum + 1)");
> 			}
>+
>+			TestNewAccessibleName (orig);
> 		}
> 		
>  		[Test]
>@@ -402,6 +440,8 @@
> 			InterfaceComponent (type, atkComponent);
> 
> 			Parent (type, accessible);
>+
>+			TestNewAccessibleName (accessible);
> 		}
> 		
>  		[Test]
>@@ -438,6 +478,8 @@
> 			SetReadOnly (type, accessible, false);
> 			ExpectEvents (1, Atk.Role.SpinButton, "object:state-changed:editable");
> 			Assert.IsTrue (accessible.RefStateSet().ContainsState (Atk.StateType.Editable), "Non-ReadOnly spinner should be editable");
>+
>+			TestNewAccessibleName (accessible);
> 		}
> 		
> 		[Test]
>@@ -475,6 +517,8 @@
> //			PropertyRole (type, accessible);
> //			
> //			Assert.AreEqual (0, accessible.NAccessibleChildren, "TextBoxEntry numChildren");
>+
>+			TestNewAccessibleName (accessible);
> 		}
> 
> 		[Test]
>@@ -514,6 +558,8 @@
> 				int nAccessibleChildren = (TextBoxHasScrollBar? 1: 0);
> 				Assert.AreEqual (nAccessibleChildren, accessible.NAccessibleChildren, "TextBoxView NAccessibleChildren");
> 			}
>+
>+			TestNewAccessibleName (accessible);
> 		}
> 
> 		[Test]
>@@ -535,6 +581,8 @@
> 			  Atk.StateType.Showing,
> 			  Atk.StateType.Visible,
> 			  Atk.StateType.SingleLine);
>+
>+			TestNewAccessibleName (accessible);
> 		}
> 		
> 		[Test]
>@@ -582,6 +630,8 @@
> 				names.Add (submenu.Label);
> 			Atk.Selection atkSelection = CastToAtkInterface <Atk.Selection> (accessible);
> 			InterfaceSelection (atkSelection, names.ToArray (), accessible, type);
>+
>+			TestNewAccessibleName (accessible);
> 		}
> 		
> 		[Test]
>@@ -658,6 +708,9 @@
> 				currentTopLevelItems = -1;
> 				throw;
> 			} finally {
>+				//if we tested this after we close the contextmenu, it would obviously fail
>+				TestNewAccessibleName (accessible);
>+				
> 				if (currentTopLevelItems != -1)
> 					currentTopLevelItems = GetTopLevelRootItem ().NAccessibleChildren;
> 				CloseContextMenu (accessible);
>@@ -706,6 +759,8 @@
> 			InterfaceAction (type, atkAction, accessible);
> 
> 			InterfaceText (type, true, accessible);
>+
>+			TestNewAccessibleName (accessible);
> 		}
> 
> 		
>@@ -770,6 +825,8 @@
> 			menu = new List <MenuLayout> (new MenuLayout [] { new MenuLayout (simpleTestText, firstSubmenus), new MenuLayout ("Help") });
> 			accessible = GetAccessible (type, menu);
> 			InterfaceText (type, true, accessible);
>+
>+			TestNewAccessibleName (accessible);
> 		}
> 
> 		[Test]
>@@ -878,6 +935,8 @@
> 			//check the Action impl of a comboboxitem (menuitem role)
> 			atkAction = CastToAtkInterface <Atk.Action> (secondComboBoxItem);
> 			InterfaceAction (BasicWidgetType.ComboBoxItem, atkAction, secondComboBoxItem);
>+
>+			TestNewAccessibleName (accessible);
> 		}
> 		
> 		//it's safer to put this test the last, apparently Atk makes it unresponsive after dealing with
>@@ -925,8 +984,7 @@
> 			//check the Action impl of a comboboxitem (menuitem role)
> 			atkAction = CastToAtkInterface <Atk.Action> (secondComboBoxItem);
> 			InterfaceAction (BasicWidgetType.ComboBoxItem, atkAction, secondComboBoxItem);
>-			
>-			
>+
> 			if (widget != null)
> 				return;
> 			//bug 503281
>@@ -934,6 +992,8 @@
> 			names = new string [] { "Test1", "Test2" };
> 			accessible = GetAccessible (type, names, selected, widget);
> 			Assert.AreEqual (names [selected], accessible.Name, "expected " + names [selected] + ", we got " + accessible.Name);
>+			
>+			TestNewAccessibleName (accessible);
> 		}
> 		
> 		[Test]
>@@ -1004,6 +1064,8 @@
> 					atkSelection.AddSelection (0);
> 				});
> 			}
>+
>+			TestNewAccessibleName (accessible);
> 		}
> 
> 		[Test]
>@@ -1029,6 +1091,8 @@
> 			Assert.AreEqual (0, accessible.NAccessibleChildren, "Button numChildren");
> 
> 			Parent (type, accessible);
>+			
>+			TestNewAccessibleName (accessible);
> 
> 			Atk.Image atkWithoutImage, atkWithImage;
> 			atkWithImage = CastToAtkInterface <Atk.Image> (accessible);
>@@ -1106,6 +1170,8 @@
> 			Relation (Atk.RelationType.NodeChildOf, child1, group);
> 
> 			Assert.AreEqual (3, atkTable.NColumns, "Table NumColumns");
>+
>+			TestNewAccessibleName (accessible);
> 		}
> 
> 		protected string simpleTable = "<table>"+
>@@ -1180,6 +1246,8 @@
> 				Atk.Selection atkSelection = CastToAtkInterface <Atk.Selection> (accessible);
> 				InterfaceSelection (atkSelection, names, accessible, BasicWidgetType.ComboBoxDropDownEntry);
> 			}
>+
>+			TestNewAccessibleName (accessible);
> 		}
> 		
> 		[Test]
>@@ -1190,7 +1258,7 @@
> 
> 			accessible = GetAccessible (type, simpleTable, true);
> 			
>-			Assert.AreEqual (null, accessible.Name, "acc.name==null");
>+			Assert.AreEqual (String.Empty, accessible.Name ?? String.Empty, "acc.name==null");
> 
> 			Atk.Component atkComponent = CastToAtkInterface <Atk.Component> (accessible);
> 			InterfaceComponent (type, atkComponent);
>@@ -1270,6 +1338,8 @@
> 				int rowIndex = atkTable.GetRowAtIndex (item4Index);
> 				Assert.IsTrue (rowIndex == -1 || rowIndex >= atkTable.NRows, "Child row after collapse");
> 			}
>+
>+			TestNewAccessibleName (accessible);
> 		}
> 
> 		[Test]
>@@ -1295,7 +1365,9 @@
> 			  Atk.StateType.Sensitive,
> 			  Atk.StateType.Resizable,
> 			  Atk.StateType.Showing,
>-			  Atk.StateType.Visible); 
>+			  Atk.StateType.Visible);
>+
>+			TestNewAccessibleName (accessible);
> 		}
> 
> 		[Test]
>@@ -1330,6 +1402,8 @@
> 			  Atk.StateType.Sensitive,
> 			  Atk.StateType.Showing,
> 			  Atk.StateType.Visible);
>+
>+			TestNewAccessibleName (accessible);
> 		}
> 
> 		[Test]
>@@ -1362,6 +1436,8 @@
> 
> 			if (accessible.NAccessibleChildren < 1)
> 				Assert.Fail ("Accessible should have children!");
>+
>+			TestNewAccessibleName (accessible);
> 		}
> 
> 		[Test]
>@@ -1427,7 +1503,7 @@
> 				CastToAtkInterface <Atk.Action> (accessible.Parent).DoAction (0);
> 			});
> 			
>-
>+			TestNewAccessibleName (accessible);
> 		}
> 		
> 		[Test]
>@@ -1439,6 +1515,8 @@
> 			string name = "test";
> 			accessible = GetAccessible (type, name, true);
> 			HSplitter (accessible);
>+
>+			TestNewAccessibleName (accessible);
> 		}
> 
>  		[Test]
>@@ -1470,6 +1548,8 @@
> 				Atk.StateType.Showing,
> 			Atk.StateType.Vertical,
> 				Atk.StateType.Visible);
>+
>+			TestNewAccessibleName (accessible);
> 		}
> 		
> 		[Test]
>@@ -1540,6 +1620,8 @@
> 				Assert.IsTrue (w2 < w1, "Right control width decreased");
> 				Assert.AreEqual (h2, h1, "Height should not change");
> 			});
>+
>+			TestNewAccessibleName (accessible);
> 		}
> 	}
> }
>Index: UiaAtkBridge/Test/AtkTest/AtkTester.cs
>===================================================================
>--- UiaAtkBridge/Test/AtkTest/AtkTester.cs	(revision 138882)
>+++ UiaAtkBridge/Test/AtkTest/AtkTester.cs	(working copy)
>@@ -72,7 +72,13 @@
> 
> 		public abstract void SetReadOnly (BasicWidgetType type, Atk.Object accessible, bool readOnly);
> 
>+		public virtual void SetAccessibleName (Atk.Object accessible, string newName)
>+		{
>+			accessible.Name = newName;
>+		}
>+
> 		public abstract Atk.Object ActivateAdditionalForm (string name);
>+
> 		public abstract void RemoveAdditionalForm (Atk.Object obj);
> 
> 		public abstract Atk.Object GetTopLevelRootItem ();
>@@ -949,6 +955,8 @@
> 		
> 		protected void PropertyRole (BasicWidgetType type, Atk.Object accessible)
> 		{
>+			if (accessible == null)
>+				throw new ArgumentNullException ("accessible");
> 			Atk.Role role = GetRole (type);
> 			Assert.AreEqual (role, accessible.Role, "Atk.Role, we got " + accessible.Role);
> 		}
>@@ -1207,7 +1215,7 @@
> 			if (Misc.HasReadOnlyText (type))
> 				Assert.AreEqual (name, accessible.Name, "accessible.Name");
> 			else
>-				Assert.IsNull (accessible.Name, "accessible.Name");
>+				Assert.AreEqual (accessible.Name ?? String.Empty, String.Empty, "accessible.Name");
> 			
> 			int caret = 0;
> 			if ((type == BasicWidgetType.TextBoxView || type == BasicWidgetType.RichTextBox) && TextBoxCaretInitiallyAtEnd)
>@@ -1485,7 +1493,7 @@
> 			if (Misc.HasReadOnlyText (type) && type != BasicWidgetType.RichTextBox)
> 				Assert.AreEqual (name, accessible.Name, "accessible.Name");
> 			else
>-				Assert.IsNull (accessible.Name, "accessible.Name");
>+				Assert.AreEqual (accessible.Name ?? String.Empty, String.Empty, "accessible.Name");
> 			
> 			Assert.AreEqual (name.Length, atkText.CharacterCount, "CharacterCount");
> 			Assert.AreEqual (String.Empty + name [0], String.Empty + atkText.GetCharacterAtOffset (0), "GetCharacterAtOffset");
>@@ -2282,6 +2290,17 @@
> 			}
> 		}
> 
>+		protected void TestNewAccessibleName (Atk.Object accessible)
>+		{
>+			string newName = "new name!";
>+			string oldName = accessible.Name;
>+			SetAccessibleName (accessible, newName);
>+			Assert.AreEqual (newName, accessible.Name, "setting a new accessible Name didn't work");
>+			if (oldName == null)
>+				oldName = String.Empty;
>+			SetAccessibleName (accessible, oldName);
>+		}
>+
> 		public abstract void RunInGuiThread (System.Action d);
> 	}
> }
>Index: UiaAtkBridge/Test/UiaAtkBridgeTest/BridgeTests.cs
>===================================================================
>--- UiaAtkBridge/Test/UiaAtkBridgeTest/BridgeTests.cs	(revision 138882)
>+++ UiaAtkBridge/Test/UiaAtkBridgeTest/BridgeTests.cs	(working copy)
>@@ -669,7 +669,7 @@
> 				f.Show ();
> 				Atk.Object accessible = GetAdapterForWidget (f);
> 				Assert.AreEqual (1, accessible.NAccessibleChildren, "Form should have one child");
>-				Atk.Object child = accessible.RefAccessibleChild (0);
>+				Atk.Object child = GetAdapterForWidget (splitter);
> 				HSplitter (child);
> 				f.Controls.Remove (splitter);
> 				Assert.AreEqual (2, accessible.NAccessibleChildren, "Form should have two children after removing splitter");
>Index: UiaAtkBridge/Test/UiaAtkBridgeTest/BridgeTester.cs
>===================================================================
>--- UiaAtkBridge/Test/UiaAtkBridgeTest/BridgeTester.cs	(revision 138882)
>+++ UiaAtkBridge/Test/UiaAtkBridgeTest/BridgeTester.cs	(working copy)
>@@ -35,6 +35,8 @@
> using System.ComponentModel;
> using System.Drawing;
> 
>+using System.Reflection;
>+
> using Mono.UIAutomation.Winforms;
> 
> using NUnit.Framework;
>@@ -412,6 +414,24 @@
> 			}
> 			butWithImage.Focus ();
> 		}
>+
>+		public override void SetAccessibleName (Atk.Object accessible, string newName)
>+		{
>+			if (accessible == null)
>+				throw new ArgumentNullException ("accessible");
>+
>+			var comp = mappings [accessible] as Component;
>+			var control = comp as SWF.Control;
>+			if (control != null)
>+				control.AccessibleName = newName;
>+			else if (comp != null) {
>+				var prop = mappings [accessible].GetType ().GetProperty ("AccessibleName", BindingFlags.Instance | BindingFlags.Public);
>+				if (prop != null)
>+					prop.SetValue (comp, newName, null);
>+			}
>+		}
>+
>+		
> 		public override object CastToAtkInterface (Type t, Atk.Object accessible)
> 		{
> 			if (t == typeof (Atk.Action)) {
>@@ -708,7 +728,6 @@
> 		private Atk.Object GetAccessible (BasicWidgetType type, string name, object widget, bool real, bool embeddedImage)
> 		{
> 			Atk.Object accessible = null;
>-			string[] names = null;
> 			XmlDocument xml;
> 			XmlElement root;
> 
>@@ -803,40 +822,6 @@
> 					accessible = new UiaAtkBridge.TextContainer (ProviderFactory.GetProvider (sb, true, true));
> 				break;
> 
>-			case BasicWidgetType.HScrollBar:
>-				names = new string [] { "First item", "Second Item", "Last Item", "A really, really long item that's here to try to ensure that we have a scrollbar, assuming that it's even possible to have a scrollbar just by having a relaly, really long item and we don't also have to perform some other function which I'm not aware of, like display the form on the screen" };
>-				accessible = GetAccessible (type, names, real);
>-				for (int i = accessible.NAccessibleChildren - 1; i >= 0; i--)
>-				{
>-					Atk.Object child = accessible.RefAccessibleChild (i);
>-					if (child.Role == Atk.Role.ScrollBar && child.RefStateSet().ContainsState(Atk.StateType.Horizontal))
>-					{
>-						accessible = child;
>-						break;
>-					}
>-				}
>-				if (accessible.Role != Atk.Role.ScrollBar)
>-					return null;
>-				break;
>-
>-			case BasicWidgetType.VScrollBar:
>-				names = new string [100];
>-				for (int i = 0; i < 100; i++)
>-					names [i] = i.ToString();
>-				accessible = GetAccessible (type, names, real);
>-				for (int i = accessible.NAccessibleChildren - 1; i >= 0; i--)
>-				{
>-					Atk.Object child = accessible.RefAccessibleChild (i);
>-					if (child.Role == Atk.Role.ScrollBar && child.RefStateSet().ContainsState(Atk.StateType.Vertical))
>-					{
>-						accessible = child;
>-						break;
>-					}
>-				}
>-				if (accessible.Role != Atk.Role.ScrollBar)
>-					return null;
>-				break;
>-
> 			case BasicWidgetType.ProgressBar:
> 				SWF.ProgressBar pb = new SWF.ProgressBar ();
> 				if (real) {
>Index: UiaAtkBridge/UiaAtkBridge/Button.cs
>===================================================================
>--- UiaAtkBridge/UiaAtkBridge/Button.cs	(revision 138882)
>+++ UiaAtkBridge/UiaAtkBridge/Button.cs	(working copy)
>@@ -225,23 +225,11 @@
> 				base.RaiseAutomationPropertyChangedEvent (e);
> 		}
> 		
>-		protected override void UpdateNameProperty (string newName, bool fromCtor)
>+		protected override void UpdateNameProperty (string newName)
> 		{
>-			base.UpdateNameProperty (newName, fromCtor);
>+			base.UpdateNameProperty (newName);
> 
>-			// If we're being called from the ctor, textExpert
>-			// won't be initialized yet so bail
>-			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);
>-
>-			adapter.EmitTextChanged (Atk.TextChangedDetail.Insert, 0,
>-						 newName == null ? 0 : newName.Length);
>-			EmitVisibleDataChanged ();
>+			textExpert.EmitTextChanged (newName);
> 		}
> 
> 		// TODO: although UIA doesn't cover press and release actions, figure out if maybe it's useful to
>Index: UiaAtkBridge/UiaAtkBridge/BaseTextImplementor.cs
>===================================================================
>--- UiaAtkBridge/UiaAtkBridge/BaseTextImplementor.cs	(revision 138882)
>+++ UiaAtkBridge/UiaAtkBridge/BaseTextImplementor.cs	(working copy)
>@@ -442,6 +442,18 @@
> 				
> 			return false;
> 		}
>+		
>+		public void EmitTextChanged (string newName)
>+		{
>+			Atk.TextAdapter adapter = new Atk.TextAdapter ((Atk.TextImplementor)resource);
>+
>+			// First delete all text, then insert the new text
>+			adapter.EmitTextChanged (Atk.TextChangedDetail.Delete, 0, Length);
>+
>+			adapter.EmitTextChanged (Atk.TextChangedDetail.Insert, 0, newName == null ? 0 : newName.Length);
>+
>+			resource.EmitDataChanged ();
>+		}
> #endregion
> 
> #region Protected Fields
>Index: UiaAtkBridge/UiaAtkBridge/Tree.cs
>===================================================================
>--- UiaAtkBridge/UiaAtkBridge/Tree.cs	(revision 138882)
>+++ UiaAtkBridge/UiaAtkBridge/Tree.cs	(working copy)
>@@ -178,7 +178,7 @@
> 			}
> 		}
> 
>-		protected override void UpdateNameProperty (string newName, bool fromCtor)
>+		protected override void SetNameProperty (string newName)
> 		{
> 			// Don't allow the name to be set
> 		}
>Index: UiaAtkBridge/UiaAtkBridge/List.cs
>===================================================================
>--- UiaAtkBridge/UiaAtkBridge/List.cs	(revision 138882)
>+++ UiaAtkBridge/UiaAtkBridge/List.cs	(working copy)
>@@ -159,13 +159,13 @@
> 			selectionHelper = new SelectionProviderUserHelper (provider, selectionProvider);
> 		}
> 
>-		protected override void UpdateNameProperty (string newName, bool fromCtor)
>+		protected override void UpdateNameProperty (string newName)
> 		{
> 			// ControlType.List returns Name from one static label, Atk returns NULL
> 			int controlTypeId = (int) Provider.GetPropertyValue (
> 				AutomationElementIdentifiers.ControlTypeProperty.Id);
> 			if (controlTypeId != ControlType.List.Id && controlTypeId != ControlType.Spinner.Id)
>-				base.UpdateNameProperty (newName, fromCtor);
>+				base.SetNameProperty (newName);
> 		}
> 		
> 		protected override Atk.StateSet OnRefStateSet ()
>Index: UiaAtkBridge/UiaAtkBridge/TextLabel.cs
>===================================================================
>--- UiaAtkBridge/UiaAtkBridge/TextLabel.cs	(revision 138882)
>+++ UiaAtkBridge/UiaAtkBridge/TextLabel.cs	(working copy)
>@@ -71,24 +71,11 @@
> 			get { return 0; }
> 		}
> 
>-		protected override void UpdateNameProperty (string newName, bool fromCtor)
>+		protected override void UpdateNameProperty (string newName)
> 		{
>-			base.UpdateNameProperty (newName, fromCtor);
>+			base.UpdateNameProperty (newName);
> 
>-			// If we're being called from the ctor, textExpert
>-			// won't be initialized yet so bail
>-			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);
>-
>-			adapter.EmitTextChanged (Atk.TextChangedDetail.Insert, 0,
>-						 newName == null ? 0 : newName.Length);
>-
>-			EmitVisibleDataChanged ();
>+			textExpert.EmitTextChanged (newName);
> 		}
> 
> 		public string GetText (int startOffset, int endOffset)
>Index: UiaAtkBridge/UiaAtkBridge/TextContainer.cs
>===================================================================
>--- UiaAtkBridge/UiaAtkBridge/TextContainer.cs	(revision 138882)
>+++ UiaAtkBridge/UiaAtkBridge/TextContainer.cs	(working copy)
>@@ -163,24 +163,11 @@
> 			Log.Warn ("TextContainer: RaiseStructureChangedEvent not implemented.");
> 		}
> 
>-		protected override void UpdateNameProperty (string newName, bool fromCtor)
>+		protected override void UpdateNameProperty (string newName)
> 		{
>-			base.UpdateNameProperty (newName, fromCtor);
>+			base.UpdateNameProperty (newName);
> 
>-			// If we're being called from the ctor, textExpert
>-			// won't be initialized yet so bail
>-			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);
>-
>-			adapter.EmitTextChanged (Atk.TextChangedDetail.Insert, 0,
>-						 newName == null ? 0 : newName.Length);
>-
>-			EmitVisibleDataChanged ();
>+			textExpert.EmitTextChanged (newName);
> 		}
> 	}
> 
>Index: UiaAtkBridge/UiaAtkBridge/Tab.cs
>===================================================================
>--- UiaAtkBridge/UiaAtkBridge/Tab.cs	(revision 138882)
>+++ UiaAtkBridge/UiaAtkBridge/Tab.cs	(working copy)
>@@ -46,7 +46,7 @@
> 			Role = Atk.Role.PageTabList;
> 		}
> 
>-		protected override void UpdateNameProperty (string newName, bool fromCtor)
>+		protected override void SetNameProperty (string newName)
> 		{
> 		}
> 
>Index: UiaAtkBridge/UiaAtkBridge/Container.cs
>===================================================================
>--- UiaAtkBridge/UiaAtkBridge/Container.cs	(revision 138882)
>+++ UiaAtkBridge/UiaAtkBridge/Container.cs	(working copy)
>@@ -58,14 +58,14 @@
> 				base.RaiseAutomationEvent (eventId, e);
> 		}
> 
>-		protected override void UpdateNameProperty (string newName, bool fromCtor)
>+		protected override void SetNameProperty (string newName)
> 		{
> 			int controlTypeId = (int) Provider.GetPropertyValue (
> 				AutomationElementIdentifiers.ControlTypeProperty.Id);
> 			if (controlTypeId == ControlType.MenuItem.Id)
> 				return;
> 
>-			base.UpdateNameProperty (newName, fromCtor);
>+			base.SetNameProperty (newName);
> 		}
> 
> 		public override void RaiseStructureChangedEvent (object childProvider, StructureChangedEventArgs e)
>Index: UiaAtkBridge/UiaAtkBridge/Slider.cs
>===================================================================
>--- UiaAtkBridge/UiaAtkBridge/Slider.cs	(revision 138882)
>+++ UiaAtkBridge/UiaAtkBridge/Slider.cs	(working copy)
>@@ -45,7 +45,7 @@
> 			oldText = textExpert.Text;
> 		}
> 
>-		protected override void UpdateNameProperty (string newName, bool fromCtor)
>+		protected override void SetNameProperty (string newName)
> 		{
> 			// ControlType.Slider returns Name from one static label, Atk returns NULL
> 		}
>Index: UiaAtkBridge/UiaAtkBridge/ComboBoxOptions.cs
>===================================================================
>--- UiaAtkBridge/UiaAtkBridge/ComboBoxOptions.cs	(revision 138882)
>+++ UiaAtkBridge/UiaAtkBridge/ComboBoxOptions.cs	(working copy)
>@@ -164,7 +164,7 @@
> 			base.RaiseAutomationPropertyChangedEvent (e);
> 		}
> 
>-		protected override void UpdateNameProperty (string newName, bool fromCtor)
>+		protected override void SetNameProperty (string newName)
> 		{
> 		}
> 	}
>Index: UiaAtkBridge/UiaAtkBridge/WrapperPanel.cs
>===================================================================
>--- UiaAtkBridge/UiaAtkBridge/WrapperPanel.cs	(revision 138882)
>+++ UiaAtkBridge/UiaAtkBridge/WrapperPanel.cs	(working copy)
>@@ -49,7 +49,7 @@
> 			return states;
> 		}
> 
>-		protected override void UpdateNameProperty (string newName, bool fromCtor)
>+		protected override void SetNameProperty (string newName)
> 		{
> 		}
> 	}
>Index: UiaAtkBridge/UiaAtkBridge/Hyperlink.cs
>===================================================================
>--- UiaAtkBridge/UiaAtkBridge/Hyperlink.cs	(revision 138882)
>+++ UiaAtkBridge/UiaAtkBridge/Hyperlink.cs	(working copy)
>@@ -297,15 +297,14 @@
> 			this.Parent = parent;
> 			this.hyperlink = parent;
> 			this.index = index;
>-			UpdateNameProperty (null, false);
>+			UpdateNameProperty (null);
> 			parent.AddOneChild (this);
> 		}
> 
>-		protected override void UpdateNameProperty (string newName, bool fromCtor)
>+		protected override void SetNameProperty (string newName)
> 		{
>-			if (hyperlink != null) {
>+			if (hyperlink != null)
> 				Name = hyperlink.hypertext.Uri (index);
>-			}
> 		}
> 		
> 		protected override Atk.StateSet OnRefStateSet ()
>Index: UiaAtkBridge/UiaAtkBridge/ComboBox.cs
>===================================================================
>--- UiaAtkBridge/UiaAtkBridge/ComboBox.cs	(revision 138882)
>+++ UiaAtkBridge/UiaAtkBridge/ComboBox.cs	(working copy)
>@@ -80,7 +80,7 @@
> 			return states;
> 		}
> 
>-		protected override void UpdateNameProperty (string newName, bool fromCtor)
>+		protected override void SetNameProperty (string newName)
> 		{
> 			// We'll manage the name manually
> 		}
>Index: UiaAtkBridge/UiaAtkBridge/TextBoxEntryView.cs
>===================================================================
>--- UiaAtkBridge/UiaAtkBridge/TextBoxEntryView.cs	(revision 138882)
>+++ UiaAtkBridge/UiaAtkBridge/TextBoxEntryView.cs	(working copy)
>@@ -74,10 +74,10 @@
> 			}
> 		}
> 
>-		protected override void UpdateNameProperty (string newName, bool fromCtor)
>+		protected override void SetNameProperty (string newName)
> 		{
> 			if (IsTableCell)
>-				base.UpdateNameProperty (newName, fromCtor);
>+				base.SetNameProperty (newName);
> 		}
> 
> 		protected override Atk.StateSet OnRefStateSet ()
>Index: UiaAtkBridge/UiaAtkBridge/Adapter.cs
>===================================================================
>--- UiaAtkBridge/UiaAtkBridge/Adapter.cs	(revision 138882)
>+++ UiaAtkBridge/UiaAtkBridge/Adapter.cs	(working copy)
>@@ -126,10 +126,8 @@
> 
> 				// Don't set Name if we don't really want to
> 				// and don't fire events if we're not changing
>-				if (!(Name == null && newName == String.Empty)
>-				    && Name != newName) {
>-					UpdateNameProperty ((string)e.NewValue, false);
>-				}
>+				if (!(Name == null && newName == String.Empty) && Name != newName)
>+					UpdateNameProperty ((string)e.NewValue);
> 			}
> 		}
> 
>@@ -160,20 +158,22 @@
> 			if (!String.IsNullOrEmpty (desc))
> 				Description = desc;
> 
>-			UpdateNameProperty (Provider.GetPropertyValue (
>-				AutomationElementIdentifiers.NameProperty.Id)
>-					as string,
>-				true);
>+			SetNameProperty (Provider.GetPropertyValue (AutomationElementIdentifiers.NameProperty.Id) as string);
> 		}
>+		
>+		internal void EmitDataChanged ()
>+		{
>+			EmitVisibleDataChanged ();
>+		}
> 
>-		protected virtual void UpdateNameProperty (string newName, bool fromCtor)
>+		protected virtual void SetNameProperty (string newName)
> 		{
>-			if (fromCtor) {
>-				if (!String.IsNullOrEmpty (newName))
>-					Name = newName;
>-				return;
>-			}
>-
>+			if (!String.IsNullOrEmpty (newName))
>+				Name = newName;
>+		}
>+		
>+		protected virtual void UpdateNameProperty (string newName)
>+		{
> 			if (Name == null && String.IsNullOrEmpty (newName))
> 				return;
> 
>Index: UiaAtkBridge/UiaAtkBridge/SplitContainer.cs
>===================================================================
>--- UiaAtkBridge/UiaAtkBridge/SplitContainer.cs	(revision 138882)
>+++ UiaAtkBridge/UiaAtkBridge/SplitContainer.cs	(working copy)
>@@ -126,7 +126,8 @@
> 		{
> 			if (e.Property == RangeValuePatternIdentifiers.ValueProperty) {
> 				Notify ("accessible-value");
>-			}
>+			} else
>+				base.RaiseAutomationPropertyChangedEvent (e);
> 		}
> 	}
> }
>Index: UiaAtkBridge/UiaAtkBridge/ITextImplementor.cs
>===================================================================
>--- UiaAtkBridge/UiaAtkBridge/ITextImplementor.cs	(revision 138882)
>+++ UiaAtkBridge/UiaAtkBridge/ITextImplementor.cs	(working copy)
>@@ -37,8 +37,8 @@
> 		}
> 		
> 		int NSelections {
>-				get;
>-			}
>+			get;
>+		}
> 
> 		string GetSelection (int selectionNum, out int startOffset, out int endOffset);
> 		bool AddSelection (int startOffset, int endOffset);
>@@ -82,5 +82,7 @@
> 
> 		bool RaiseAutomationEvent (AutomationEvent eventId, AutomationEventArgs e);
> 		bool RaiseAutomationPropertyChangedEvent (AutomationPropertyChangedEventArgs e);
>+		
>+		void EmitTextChanged (string newName);
> 	}
> }
>Index: UIAutomationWinforms/UIAutomationWinforms/Mono.UIAutomation.Winforms/ToolStripItemProvider.cs
>===================================================================
>--- UIAutomationWinforms/UIAutomationWinforms/Mono.UIAutomation.Winforms/ToolStripItemProvider.cs	(revision 138882)
>+++ UIAutomationWinforms/UIAutomationWinforms/Mono.UIAutomation.Winforms/ToolStripItemProvider.cs	(working copy)
>@@ -66,8 +66,12 @@
> 				return Catalog.GetString ("menu item");
> 			else if (propertyId == AEIds.LabeledByProperty.Id)
> 				return null;
>-			else if (propertyId == AEIds.NameProperty.Id)
>-				return item.Text;
>+			else if (propertyId == AEIds.NameProperty.Id) {
>+				string baseName = base.GetProviderPropertyValue (propertyId) as string;
>+				if (baseName == null)
>+					return item.Text;
>+				return baseName;
>+			}
> 			else if (propertyId == AEIds.IsOffscreenProperty.Id) {
> 				return Helper.ToolStripItemIsOffScreen (item);
> 			} else if (propertyId == AEIds.IsEnabledProperty.Id)
>Index: UIAutomationWinforms/UIAutomationWinforms/Mono.UIAutomation.Winforms/SimpleControlProvider.cs
>===================================================================
>--- UIAutomationWinforms/UIAutomationWinforms/Mono.UIAutomation.Winforms/SimpleControlProvider.cs	(revision 138882)
>+++ UIAutomationWinforms/UIAutomationWinforms/Mono.UIAutomation.Winforms/SimpleControlProvider.cs	(working copy)
>@@ -35,6 +35,8 @@
> using Mono.UIAutomation.Winforms.Navigation;
> using AEIds = System.Windows.Automation.AutomationElementIdentifiers;
> 
>+using System.Reflection;
>+
> namespace Mono.UIAutomation.Winforms
> {
> 	internal abstract class SimpleControlProvider : IRawElementProviderSimple
>@@ -61,7 +63,7 @@
> 		
> 		protected SimpleControlProvider (Component component)
> 		{
>-			this.component = component;
>+			Component = component;
> 			control = component as SWF.Control;
> 			
> 			events = new Dictionary<ProviderEventType,IConnectable> ();
>@@ -86,6 +88,15 @@
> 
> 		public Component Component {
> 			get { return component; }
>+			protected set { 
>+				if (component != value) {
>+					component = value;
>+					componentAccessibleNameProp = value.GetType ().GetProperty ("AccessibleName", BindingFlags.Instance | BindingFlags.Public);
>+					var handler = ComponentChanged;
>+					if (handler != null)
>+						ComponentChanged ();
>+				}
>+			}
> 		}
> 		
> 		public SWF.Control Control {
>@@ -107,6 +118,7 @@
> 		#region Public Events
> 		
> 		public event ProviderBehaviorEventHandler ProviderBehaviorSet;
>+		public event Action ComponentChanged;
> 		
> 		#endregion
> 		
>@@ -119,6 +131,9 @@
> 			SetEvent (ProviderEventType.AutomationElementIsPatternAvailableProperty,
> 			          new AutomationIsPatternAvailablePropertyEvent (this));
> 
>+			SetEvent (ProviderEventType.AutomationElementNameProperty,
>+			          new AutomationNamePropertyEvent (this));
>+			
> 			// These events only apply to Control providers
> 			if (Control == null)
> 				return;
>@@ -127,8 +142,6 @@
> 			          new AutomationIsOffscreenPropertyEvent (this));
> 			SetEvent (ProviderEventType.AutomationElementIsEnabledProperty, 
> 			          new AutomationIsEnabledPropertyEvent (this));
>-			SetEvent (ProviderEventType.AutomationElementNameProperty,
>-			          new AutomationNamePropertyEvent (this));
> 			SetEvent (ProviderEventType.AutomationElementHasKeyboardFocusProperty,
> 			          new AutomationHasKeyboardFocusPropertyEvent (this));
> 			SetEvent (ProviderEventType.AutomationElementBoundingRectangleProperty,
>@@ -223,6 +236,8 @@
> 			}
> 		}
> 
>+		PropertyInfo componentAccessibleNameProp = null;
>+		
> 		protected virtual object GetProviderPropertyValue (int propertyId)
> 		{
> 			if (propertyId == AutomationElementIdentifiers.IsExpandCollapsePatternAvailableProperty.Id)
>@@ -281,30 +296,15 @@
> 			}
> 			else if (propertyId == AutomationElementIdentifiers.BoundingRectangleProperty.Id)
> 				return Helper.RectangleToRect (ScreenBounds);
>+			else if (propertyId == AutomationElementIdentifiers.NameProperty.Id)
>+				return GetNameProperty ();
> 			
> 			//Control-like properties
> 			if (Control == null)
> 				return null;
> 			else if (propertyId == AutomationElementIdentifiers.IsEnabledProperty.Id)
> 				return Control.Enabled;
>-			else if (propertyId == AutomationElementIdentifiers.NameProperty.Id) {
>-				if (!string.IsNullOrEmpty (Control.AccessibleName)) 
>-					return Control.AccessibleName;
>-				
>-				IRawElementProviderSimple label =
>-					GetPropertyValue (AutomationElementIdentifiers.LabeledByProperty.Id)
>-						as IRawElementProviderSimple;
>-				if (label == null) {
>-					int controlType = (int) GetPropertyValue (AutomationElementIdentifiers.ControlTypeProperty.Id);
>-					// http://msdn.microsoft.com/en-us/library/ms748367.aspx
>-					// "The Name property should never contain the textual contents of the edit control."
>-					if (controlType == ControlType.Edit.Id || controlType == ControlType.Document.Id)
>-						return string.Empty;
>-					else
>-						return Helper.StripAmpersands (Control.Text);
>-				} else
>-					return label.GetPropertyValue (AutomationElementIdentifiers.NameProperty.Id);
>-			} else if (propertyId == AutomationElementIdentifiers.LabeledByProperty.Id) {
>+			else if (propertyId == AutomationElementIdentifiers.LabeledByProperty.Id) {
> 				IRawElementProviderFragment sibling = this as IRawElementProviderFragment;
> 				if (sibling == null)
> 					return null;
>@@ -395,7 +395,6 @@
> 				if (val != null)
> 					return val;
> 			}
>-
> 			return GetProviderPropertyValue (propertyId) ?? Helper.GetDefaultAutomationPropertyValue (propertyId);
> 		}
> 
>@@ -417,6 +416,36 @@
> 		
> 		#region Private Methods
> 		
>+		private string GetNameProperty ()
>+		{
>+			if (Control != null && !string.IsNullOrEmpty (Control.AccessibleName))
>+				return Control.AccessibleName;
>+
>+			if (Component != null && Control != Component) {
>+				if (componentAccessibleNameProp != null) {
>+					var val = (string)componentAccessibleNameProp.GetValue (Component, null);
>+					if (!string.IsNullOrEmpty (val))
>+						return val;
>+				}
>+			}
>+
>+			IRawElementProviderSimple label =
>+				GetPropertyValue (AutomationElementIdentifiers.LabeledByProperty.Id)
>+					as IRawElementProviderSimple;
>+			if (label == null) {
>+				int controlType = (int) GetPropertyValue (AutomationElementIdentifiers.ControlTypeProperty.Id);
>+				// http://msdn.microsoft.com/en-us/library/ms748367.aspx
>+				// "The Name property should never contain the textual contents of the edit control."
>+				if (controlType == ControlType.Edit.Id || controlType == ControlType.Document.Id)
>+					return string.Empty;
>+				else if (Control != null)
>+					return Helper.StripAmpersands (Control.Text);
>+			} else
>+				return label.GetPropertyValue (AutomationElementIdentifiers.NameProperty.Id) as string;
>+
>+			return null;
>+		}
>+		
> 		private double DistanceFrom (IRawElementProviderSimple otherProvider)
> 		{
> 			Rect bounds = (Rect) GetPropertyValue (AutomationElementIdentifiers.BoundingRectangleProperty.Id);
>Index: UIAutomationWinforms/UIAutomationWinforms/Mono.UIAutomation.Winforms/ToolStripDropDownItemProvider.cs
>===================================================================
>--- UIAutomationWinforms/UIAutomationWinforms/Mono.UIAutomation.Winforms/ToolStripDropDownItemProvider.cs	(revision 138882)
>+++ UIAutomationWinforms/UIAutomationWinforms/Mono.UIAutomation.Winforms/ToolStripDropDownItemProvider.cs	(working copy)
>@@ -48,15 +48,18 @@
> 		{
> 			this.dropDrownItem = dropDrownItem;
> 			itemProviders = new Dictionary<ToolStripItem, FragmentControlProvider> ();
>-			
> 		}
> 
> 		#region FragmentRootControlProvider: Specializations
> 
> 		protected override object GetProviderPropertyValue (int propertyId)
> 		{
>-			if (propertyId == AEIds.NameProperty.Id)
>-				return Helper.StripAmpersands (dropDrownItem.Text);
>+			if (propertyId == AEIds.NameProperty.Id) {
>+				string baseName = base.GetProviderPropertyValue (propertyId) as string;
>+				if (baseName == null)
>+					return Helper.StripAmpersands (dropDrownItem.Text);
>+				return baseName;
>+			}
> 			else if (propertyId == AEIds.HasKeyboardFocusProperty.Id)
> 				return dropDrownItem.Selected;
> 			else
>Index: UIAutomationWinforms/UIAutomationWinforms/Mono.UIAutomation.Winforms/StatusBarProvider.cs
>===================================================================
>--- UIAutomationWinforms/UIAutomationWinforms/Mono.UIAutomation.Winforms/StatusBarProvider.cs	(revision 138882)
>+++ UIAutomationWinforms/UIAutomationWinforms/Mono.UIAutomation.Winforms/StatusBarProvider.cs	(working copy)
>@@ -75,8 +75,6 @@
> 				return Catalog.GetString ("status bar");
> 			else if (propertyId == AutomationElementIdentifiers.LabeledByProperty.Id)
> 				return null;
>-			else if (propertyId == AutomationElementIdentifiers.NameProperty.Id)
>-				return statusBar.Text;
> 			else
> 				return base.GetProviderPropertyValue (propertyId);
> 		}
>Index: UIAutomationWinforms/UIAutomationWinforms/Mono.UIAutomation.Winforms/PaneProvider.cs
>===================================================================
>--- UIAutomationWinforms/UIAutomationWinforms/Mono.UIAutomation.Winforms/PaneProvider.cs	(revision 138882)
>+++ UIAutomationWinforms/UIAutomationWinforms/Mono.UIAutomation.Winforms/PaneProvider.cs	(working copy)
>@@ -39,7 +39,6 @@
> 		
> 		public PaneProvider (Component component) : base (component)
> 		{
>-			this.component = component;
> 		}
> 		
> 		#endregion
>@@ -47,7 +46,7 @@
> 		#region SimpleControlProvider: Specialization
> 		
> 		public override Component Container  {
>-			get { return component.Container as Component; }
>+			get { return Component.Container as Component; }
> 		}
> 		
> 		protected override object GetProviderPropertyValue (int propertyId)
>@@ -63,12 +62,6 @@
> 		}
> 
> 		#endregion
>-		
>-		#region Private Fields
>-		
>-		private Component component;
>-		
>-		#endregion
> 
> 	}
> }
>Index: UIAutomationWinforms/UIAutomationWinforms/Mono.UIAutomation.Winforms/ListViewProvider.cs
>===================================================================
>--- UIAutomationWinforms/UIAutomationWinforms/Mono.UIAutomation.Winforms/ListViewProvider.cs	(revision 138882)
>+++ UIAutomationWinforms/UIAutomationWinforms/Mono.UIAutomation.Winforms/ListViewProvider.cs	(working copy)
>@@ -1186,7 +1186,9 @@
> 					return Catalog.GetString ("edit");
> 				else if (propertyId == AutomationElementIdentifiers.NameProperty.Id) {
> 					IValueProvider valueProvider = (IValueProvider) GetBehavior (ValuePatternIdentifiers.Pattern);
>-					return valueProvider.Value;
>+					if (valueProvider != null)
>+						return valueProvider.Value;
>+					return null;
> 				} else if (propertyId == AutomationElementIdentifiers.IsKeyboardFocusableProperty.Id)
> 					return IsFirstColumn || itemProvider.ListView.FullRowSelect;
> 				else if (propertyId == AutomationElementIdentifiers.HasKeyboardFocusProperty.Id) {
>Index: UIAutomationWinforms/UIAutomationWinforms/Mono.UIAutomation.Winforms/ToolStripProvider.cs
>===================================================================
>--- UIAutomationWinforms/UIAutomationWinforms/Mono.UIAutomation.Winforms/ToolStripProvider.cs	(revision 138882)
>+++ UIAutomationWinforms/UIAutomationWinforms/Mono.UIAutomation.Winforms/ToolStripProvider.cs	(working copy)
>@@ -59,8 +59,6 @@
> 				return Catalog.GetString ("tool bar");
> 			else if (propertyId == AEIds.LabeledByProperty.Id)
> 				return null;
>-			else if (propertyId == AEIds.NameProperty.Id)
>-				return Helper.StripAmpersands (strip.Text);
> 			else if (propertyId == AEIds.IsContentElementProperty.Id)
> 				return true;
> 			else
>Index: UIAutomationWinforms/UIAutomationWinforms/Mono.UIAutomation.Winforms/ToolStripProgressBar.cs
>===================================================================
>--- UIAutomationWinforms/UIAutomationWinforms/Mono.UIAutomation.Winforms/ToolStripProgressBar.cs	(revision 138882)
>+++ UIAutomationWinforms/UIAutomationWinforms/Mono.UIAutomation.Winforms/ToolStripProgressBar.cs	(working copy)
>@@ -38,10 +38,11 @@
> 	{
> 		private ToolStripProgressBar item = null;
> 
>-		public ToolStripProgressBarProvider (ToolStripProgressBar control)
>-			: base (control.ProgressBar)
>+		public ToolStripProgressBarProvider (ToolStripProgressBar component)
>+			: base (component.ProgressBar)
> 		{
>-			item = control;
>+			item = component;
>+			Component = item;
> 		}
> 
> 		protected override object GetProviderPropertyValue (int propertyId)
>Index: UIAutomationWinforms/UIAutomationWinforms/Mono.UIAutomation.Winforms.Events/AutomationNamePropertyEvent.cs
>===================================================================
>--- UIAutomationWinforms/UIAutomationWinforms/Mono.UIAutomation.Winforms.Events/AutomationNamePropertyEvent.cs	(revision 138882)
>+++ UIAutomationWinforms/UIAutomationWinforms/Mono.UIAutomation.Winforms.Events/AutomationNamePropertyEvent.cs	(working copy)
>@@ -28,12 +28,15 @@
> using System.Windows.Automation.Provider;
> using System.Windows.Forms;
> 
>+using System.Reflection;
>+
> namespace Mono.UIAutomation.Winforms.Events
> {
> 	
> 	internal class AutomationNamePropertyEvent 
> 		: BaseAutomationPropertyEvent
> 	{
>+		SimpleControlProvider provider;
> 		
> 		#region Constructors
> 
>@@ -41,6 +44,7 @@
> 			: base (provider,
> 			        AutomationElementIdentifiers.NameProperty)
> 		{
>+			this.provider = provider;
> 		}
> 
> 		#endregion
>@@ -49,19 +53,66 @@
> 
> 		public override void Connect ()
> 		{
>-			Provider.Control.TextChanged += new EventHandler (OnTextChanged);
>+			if (Provider.Control != null) {
>+				Provider.Control.TextChanged += new EventHandler (OnTextChanged);
>+				Provider.Control.UIAAccessibleNameChanged += new EventHandler (OnTextChanged);
>+			}
>+			
>+			ConnectComponent ();
>+			
>+			provider.ComponentChanged += ConnectComponent;
> 		}
>+		
>+		private void ConnectComponent ()
>+		{
>+			if (Provider.Component == null || Provider.Component == Provider.Control)
>+				return;
>+			
>+			/*
>+			 * the usage of reflection here is *not* only because we want to be backwards compatible (with previous Mono 
>+			 * versions that may not have these events), but because we want to simplify the code for all the scenarios
>+			 * in which Component-based widgets are involved
>+			 */
>+			try {
>+				Helper.AddPrivateEvent (Provider.Component.GetType (),
>+				                        Provider.Component,
>+				                        "UIAAccessibleNameChanged",
>+				                        this,
>+				                        "OnTextChanged");
>+			} catch (NotSupportedException) { }
>+		}
> 
> 		public override void Disconnect ()
> 		{
>-			Provider.Control.TextChanged -= new EventHandler (OnTextChanged);
>+			if (Provider.Control != null) {
>+				Provider.Control.TextChanged -= new EventHandler (OnTextChanged);
>+				Provider.Control.UIAAccessibleNameChanged -= new EventHandler (OnTextChanged);
>+			}
>+			
>+			provider.ComponentChanged -= ConnectComponent;
>+			
>+			DisconnectComponent ();
> 		}
> 		
>+		private void DisconnectComponent ()
>+		{
>+			if (Provider.Component == null || Provider.Component == Provider.Control)
>+				return;
>+			
>+			try {
>+				Helper.RemovePrivateEvent (Provider.Component.GetType (),
>+				                           Provider.Component,
>+				                           "UIAAccessibleNameChanged",
>+				                           this,
>+				                           "OnTextChanged");
>+			} catch (NotSupportedException) { }
>+		}
>+		
> 		#endregion
> 		
> 		#region Private Methods
> 
>-		private void OnTextChanged (object sender, EventArgs e)
>+		protected void OnTextChanged (object sender, EventArgs e)
> 		{
> 			RaiseAutomationPropertyChangedEvent ();
> 		}
>Index: UIAutomationWinforms/UIAutomationWinforms/Mono.UIAutomation.Winforms.Events/ToolStripItem/AutomationNamePropertyEvent.cs
>===================================================================
>--- UIAutomationWinforms/UIAutomationWinforms/Mono.UIAutomation.Winforms.Events/ToolStripItem/AutomationNamePropertyEvent.cs	(revision 138882)
>+++ UIAutomationWinforms/UIAutomationWinforms/Mono.UIAutomation.Winforms.Events/ToolStripItem/AutomationNamePropertyEvent.cs	(working copy)
>@@ -32,14 +32,13 @@
> {
> 	
> 	internal class AutomationNamePropertyEvent 
>-		: BaseAutomationPropertyEvent
>+		: Mono.UIAutomation.Winforms.Events.AutomationNamePropertyEvent
> 	{
> 		
> 		#region Constructors
> 
> 		public AutomationNamePropertyEvent (ToolStripItemProvider provider) 
>-			: base (provider,
>-			        AutomationElementIdentifiers.NameProperty)
>+			: base (provider)
> 		{
> 		}
> 
>@@ -49,24 +48,17 @@
> 
> 		public override void Connect ()
> 		{
>+			base.Connect ();
> 			((SWF.ToolStripItem)Provider.Component).TextChanged += new EventHandler (OnTextChanged);
> 		}
> 
> 		public override void Disconnect ()
> 		{
>+			base.Disconnect ();
> 			((SWF.ToolStripItem)Provider.Component).TextChanged -= new EventHandler (OnTextChanged);
> 		}
> 		
> 		#endregion
>-		
>-		#region Private Methods
> 
>-		private void OnTextChanged (object sender, EventArgs e)
>-		{
>-			RaiseAutomationPropertyChangedEvent ();
>-		}
>-
>-		#endregion
>-
> 	}
> }

Actions: View | Diff

Attachments on bug 457845: 289596 | 308553 | 308575 | 308665