Attachment #308575 for bug #457845

View | Details | Raw Unified | Return to bug 457845
Collapse All | Expand All

Lines 2150-2156 Link Here

(-)System.Windows.Forms/Control.cs (+22 lines)
2150	}	2150	}
2151		2151
2152	set {	2152	set {
		2153	if (value == accessible_name)
		2154	return;
2153	accessible_name = value;	2155	accessible_name = value;
		2156	#if NET_2_0
		2157	OnUIAAccessibleNameChanged (EventArgs.Empty);
		2158	#endif
2154	}	2159	}
2155	}	2160	}
2156		2161
Lines 6320-6325 Link Here
6320	if (eh != null)	6326	if (eh != null)
6321	eh (this, e);	6327	eh (this, e);
6322	}	6328	}
		6329
		6330	private void OnUIAAccessibleNameChanged (EventArgs e)
		6331	{
		6332	EventHandler eh = (EventHandler)(Events [UIAAccessibleNameChangedEvent]);
		6333	if (eh != null)
		6334	eh (this, e);
		6335	}
6323	#endif	6336	#endif
6324	[EditorBrowsable (EditorBrowsableState.Advanced)]	6337	[EditorBrowsable (EditorBrowsableState.Advanced)]
6325	#if NET_2_0	6338	#if NET_2_0
Lines 6727-6732 Link Here
6727	static object TabIndexChangedEvent = new object ();	6740	static object TabIndexChangedEvent = new object ();
6728	static object TabStopChangedEvent = new object ();	6741	static object TabStopChangedEvent = new object ();
6729	static object TextChangedEvent = new object ();	6742	static object TextChangedEvent = new object ();
		6743	#if NET_2_0
		6744	static object UIAAccessibleNameChangedEvent = new object ();
		6745	#endif
6730	static object ValidatedEvent = new object ();	6746	static object ValidatedEvent = new object ();
6731	static object ValidatingEvent = new object ();	6747	static object ValidatingEvent = new object ();
6732	static object VisibleChangedEvent = new object ();	6748	static object VisibleChangedEvent = new object ();
Lines 7108-7113 Link Here
7108	remove { Events.RemoveHandler (TextChangedEvent, value); }	7124	remove { Events.RemoveHandler (TextChangedEvent, value); }
7109	}	7125	}
7110		7126
		7127	#if NET_2_0
		7128	internal event EventHandler UIAAccessibleNameChanged {
		7129	add { Events.AddHandler (UIAAccessibleNameChangedEvent, value); }
		7130	remove { Events.RemoveHandler (UIAAccessibleNameChangedEvent, value); }
		7131	}
		7132	#endif
		7133
7111	public event EventHandler Validated {	7134	public event EventHandler Validated {
7112	add { Events.AddHandler (ValidatedEvent, value); }	7135	add { Events.AddHandler (ValidatedEvent, value); }
7113	remove { Events.RemoveHandler (ValidatedEvent, value); }	7136	remove { Events.RemoveHandler (ValidatedEvent, value); }

Lines 194-200 Link Here

(-)System.Windows.Forms/ToolStripItem.cs (-1 / +23 lines)
194		194
195	return this.AccessibilityObject.Name;	195	return this.AccessibilityObject.Name;
196	}	196	}
197	set { this.AccessibilityObject.Name = value; }	197	set {
		198	this.AccessibilityObject.Name = value;
		199	#if NET_2_0
		200	OnUIAAccessibleNameChanged (EventArgs.Empty);
		201	#endif
		202	}
198	}	203	}
199		204
200	[DefaultValue (AccessibleRole.Default)]	205	[DefaultValue (AccessibleRole.Default)]
Lines 1251-1256 Link Here
1251	if (eh != null)	1257	if (eh != null)
1252	eh (this, e);	1258	eh (this, e);
1253	}	1259	}
		1260
		1261	private void OnUIAAccessibleNameChanged (EventArgs e)
		1262	{
		1263	EventHandler eh = (EventHandler)(Events [UIAAccessibleNameChangedEvent]);
		1264	if (eh != null)
		1265	eh (this, e);
		1266	}
1254		1267
1255	protected internal virtual bool ProcessCmdKey (ref Message m, Keys keyData)	1268	protected internal virtual bool ProcessCmdKey (ref Message m, Keys keyData)
1256	{	1269	{
Lines 1324-1329 Link Here
1324	static object RightToLeftChangedEvent = new object ();	1338	static object RightToLeftChangedEvent = new object ();
1325	static object TextChangedEvent = new object ();	1339	static object TextChangedEvent = new object ();
1326	static object VisibleChangedEvent = new object ();	1340	static object VisibleChangedEvent = new object ();
		1341	#if NET_2_0
		1342	static object UIAAccessibleNameChangedEvent = new object ();
		1343	#endif
1327		1344
1328	[Browsable (false)]	1345	[Browsable (false)]
1329	public event EventHandler AvailableChanged {	1346	public event EventHandler AvailableChanged {
Lines 1474-1479 Link Here
1474	add { Events.AddHandler (VisibleChangedEvent, value); }	1491	add { Events.AddHandler (VisibleChangedEvent, value); }
1475	remove {Events.RemoveHandler (VisibleChangedEvent, value); }	1492	remove {Events.RemoveHandler (VisibleChangedEvent, value); }
1476	}	1493	}
		1494
		1495	#if NET_2_0
		1496	internal event EventHandler UIAAccessibleNameChanged {
		1497	add { Events.AddHandler (UIAAccessibleNameChangedEvent, value); }
		1498	remove { Events.RemoveHandler (UIAAccessibleNameChangedEvent, value); }
		1499	}
		1500	#endif
1477	#endregion	1501	#endregion
1478		1502
1479	#region Internal Methods	1503	#region Internal Methods

Return to bug 457845