diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ExpandCollapseState.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ExpandCollapseState.cs
deleted file mode 100644
index 0fbdfa0f97f..00000000000
--- a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ExpandCollapseState.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-internal static partial class Interop
-{
- internal static partial class UiaCore
- {
- public enum ExpandCollapseState
- {
- ///
- /// No children are showing
- ///
- Collapsed,
-
- ///
- /// All children are showing
- ///
- Expanded,
-
- ///
- /// Not all children are showing
- ///
- PartiallyExpanded,
-
- ///
- /// Does not expand or collapse
- ///
- LeafNode
- }
- }
-}
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IExpandCollapseProvider.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IExpandCollapseProvider.cs
index fd4f04de7af..5c3636e4465 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IExpandCollapseProvider.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IExpandCollapseProvider.cs
@@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
using System.Runtime.InteropServices;
+using Windows.Win32.UI.Accessibility;
internal static partial class Interop
{
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IRawElementProviderFragment.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IRawElementProviderFragment.cs
index 50fc53fc447..ec836194f70 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IRawElementProviderFragment.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IRawElementProviderFragment.cs
@@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
using System.Runtime.InteropServices;
+using Windows.Win32.UI.Accessibility;
internal static partial class Interop
{
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ITableProvider.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ITableProvider.cs
index 3ca452f09ae..6064b6220a8 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ITableProvider.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ITableProvider.cs
@@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
using System.Runtime.InteropServices;
+using Windows.Win32.UI.Accessibility;
internal static partial class Interop
{
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IToggleProvider.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IToggleProvider.cs
index 2c8d6755659..ec089d62590 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IToggleProvider.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.IToggleProvider.cs
@@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
using System.Runtime.InteropServices;
+using UIA = Windows.Win32.UI.Accessibility;
internal static partial class Interop
{
@@ -17,7 +18,7 @@ public interface IToggleProvider
///
/// Indicates an element's current on or off state
///
- ToggleState ToggleState { get; }
+ UIA.ToggleState ToggleState { get; }
}
}
}
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.NavigateDirection.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.NavigateDirection.cs
deleted file mode 100644
index 2a8dd722a1f..00000000000
--- a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.NavigateDirection.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-internal static partial class Interop
-{
- internal static partial class UiaCore
- {
- ///
- /// Directions for navigation the UIAutomation tree
- ///
- public enum NavigateDirection
- {
- ///
- /// Navigate to parent
- ///
- Parent,
- ///
- /// Navigate to next sibling
- ///
- NextSibling,
- ///
- /// Navigate to previous sibling
- ///
- PreviousSibling,
- ///
- /// Navigate to first child
- ///
- FirstChild,
- ///
- /// Navigate to last child
- ///
- LastChild,
- }
- }
-}
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ProviderOptions.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ProviderOptions.cs
deleted file mode 100644
index 64b6bf2608e..00000000000
--- a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ProviderOptions.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-internal static partial class Interop
-{
- internal static partial class UiaCore
- {
- [Flags]
- public enum ProviderOptions
- {
- ///
- /// Indicates that this is a client-side provider
- ///
- ClientSideProvider = 0x0001,
-
- ///
- /// Indicates that this is a server-side provider
- ///
- ServerSideProvider = 0x0002,
-
- ///
- /// Indicates that this is a non-client-area provider
- ///
- NonClientAreaProvider = 0x0004,
-
- ///
- /// Indicates that this is an override provider
- ///
- OverrideProvider = 0x0008,
-
- ///
- /// Indicates that this provider handles its own focus, and does not want
- /// UIA to set focus to the nearest HWND on its behalf when AutomationElement.SetFocus
- /// is used. This option is typically used by providers for HWNDs that appear to take
- /// focus without actually receiving actual Win32 focus, such as menus and dropdowns
- ///
- ProviderOwnsSetFocus = 0x0010,
-
- ///
- /// Indicates that this provider expects to be called according to COM threading rules:
- /// if the provider is in a Single-Threaded Apartment, it will be called only on the apartment
- /// thread. Only Server-side providers can use this option.
- ///
- UseComThreading = 0x0020
- }
- }
-}
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.RowOrColumnMajor.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.RowOrColumnMajor.cs
deleted file mode 100644
index e368aa664c4..00000000000
--- a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.RowOrColumnMajor.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-internal static partial class Interop
-{
- internal static partial class UiaCore
- {
- [Flags]
- public enum RowOrColumnMajor
- {
- RowMajor = 0,
- ColumnMajor = 1,
- Indeterminate = 2
- }
- }
-}
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.StructureChangeType.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.StructureChangeType.cs
deleted file mode 100644
index 10aab277e26..00000000000
--- a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.StructureChangeType.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-internal static partial class Interop
-{
- internal static partial class UiaCore
- {
- ///
- /// Logical structure change flags
- ///
- public enum StructureChangeType
- {
- ///
- /// Logical child added
- ///
- ChildAdded,
-
- ///
- /// Logical child removed
- ///
- ChildRemoved,
-
- ///
- /// Logical children invalidated
- ///
- ChildrenInvalidated,
-
- ///
- /// Logical children were bulk added
- ///
- ChildrenBulkAdded,
-
- ///
- /// Logical children were bulk removed
- ///
- ChildrenBulkRemoved,
- ///
- /// The order of the children below their parent has changed
- ///
- ChildrenReordered,
- }
- }
-}
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.TextPatternRangeEndpoint.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.TextPatternRangeEndpoint.cs
deleted file mode 100644
index 52c03f4d3ce..00000000000
--- a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.TextPatternRangeEndpoint.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-internal static partial class Interop
-{
- internal static partial class UiaCore
- {
- public enum TextPatternRangeEndpoint
- {
- Start = 0,
- End = 1
- }
- }
-}
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.TextUnit.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.TextUnit.cs
deleted file mode 100644
index 67237850eaf..00000000000
--- a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.TextUnit.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-internal static partial class Interop
-{
- internal static partial class UiaCore
- {
- public enum TextUnit
- {
- Character = 0,
- Format = 1,
- Word = 2,
- Line = 3,
- Paragraph = 4,
- Page = 5,
- Document = 6
- }
- }
-}
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ToggleState.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ToggleState.cs
deleted file mode 100644
index 1e51d95ffe8..00000000000
--- a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.ToggleState.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-internal static partial class Interop
-{
- internal static partial class UiaCore
- {
- [Flags]
- public enum ToggleState
- {
- Off = 0,
- On = 1,
- Indeterminate = 2
- }
- }
-}
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.UiaClientsAreListening.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.UiaClientsAreListening.cs
deleted file mode 100644
index ce322bcc29c..00000000000
--- a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.UiaClientsAreListening.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System.Runtime.InteropServices;
-
-internal partial class Interop
-{
- internal static partial class UiaCore
- {
- // Unfortunately UiaClientsAreListening() can't be used to specifically learn whether an assistive technology
- // (AT) like Narrator, Windows Magnifier, or Windows On-Screen Keyboard is running, (those 3 products are all
- // UIA clients).
- // Other UIA clients which aren't AT will also result in UiaClientsAreListening() returning true.
- // UiaClientsAreListening() was first majorly impacted when the touch keyboard was introduced for Windows touch
- // devices. The touch keyboard used UIA and so UiaClientsAreListening() returned true, regardless of whether any
- // AT is running.
- //
- // There is no known or supported way in Windows to determine that AT is running, or that a specific type of AT
- // like a screen reader is running.
- // (Don't even think about trying to achieve this with the SystemParameterInfo SPI_GETSCREENREADER flag!)
- //
- // Importing and using this method just in case one day it starts working.
-
- [DllImport(Libraries.UiaCore, ExactSpelling = true)]
- public static extern BOOL UiaClientsAreListening();
- }
-}
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.UiaRaiseStructureChangedEvent.cs b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.UiaRaiseStructureChangedEvent.cs
index 5d5ab123fd1..67f372e257c 100644
--- a/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.UiaRaiseStructureChangedEvent.cs
+++ b/src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.UiaRaiseStructureChangedEvent.cs
@@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
using System.Runtime.InteropServices;
+using Windows.Win32.UI.Accessibility;
internal partial class Interop
{
diff --git a/src/System.Windows.Forms.Primitives/src/NativeMethods.txt b/src/System.Windows.Forms.Primitives/src/NativeMethods.txt
index 2f91c082f21..37fa3b87cdb 100644
--- a/src/System.Windows.Forms.Primitives/src/NativeMethods.txt
+++ b/src/System.Windows.Forms.Primitives/src/NativeMethods.txt
@@ -177,6 +177,7 @@ EnumThreadWindows
EnumWindows
ES_*
EVENTMSG
+ExpandCollapseState
EXTLOGFONTW
ExtTextOut
FDAP
@@ -558,6 +559,7 @@ MoveToEx
MSFTEDIT_CLASS
MsgWaitForMultipleObjectsEx
MultiByteToWideChar
+NavigateDirection
NIN_*
NFR_*
NM_*
@@ -631,6 +633,7 @@ PRINTDLGEX_FLAGS
PROGRESS_CLASS
PROPERTYKEY
PropVariantClear
+ProviderOptions
ReadClassStg
READYSTATE
RealizePalette
@@ -649,6 +652,7 @@ RevokeDragDrop
REGDB_E_CLASSNOTREG
RICH_EDIT_GET_CONTEXT_MENU_SEL_TYPE
RoundRect
+RowOrColumnMajor
RPC_E_CHANGED_MODE
SAFEARRAY
SafeArrayGetRecordInfo
@@ -750,6 +754,7 @@ STGC
STGTY
STILL_ACTIVE
StretchDIBits
+StructureChangeType
SYSBUTTONSTATES
SystemParametersInfo
SystemParametersInfoForDpi
@@ -770,6 +775,7 @@ TCN_*
TCS_*
THEME_PROPERTY_SYMBOL_ID
TILE_WINDOWS_HOW
+ToggleState
TOOLTIP_FLAGS
TOOLTIPS_CLASS
TRACKBAR_CLASS
@@ -796,6 +802,7 @@ TYPEDESC
TYPEKIND
UIA_EVENT_ID
UiaAppendRuntimeId
+UiaClientsAreListening
UiaGetReservedNotSupportedValue
UiaRootObjectId
UIS_*
diff --git a/src/System.Windows.Forms.Primitives/tests/UnitTests/System/Windows/Forms/Automation/UiaTextRangeTests.cs b/src/System.Windows.Forms.Primitives/tests/UnitTests/System/Windows/Forms/Automation/UiaTextRangeTests.cs
index db75632cdb2..1638758fc0c 100644
--- a/src/System.Windows.Forms.Primitives/tests/UnitTests/System/Windows/Forms/Automation/UiaTextRangeTests.cs
+++ b/src/System.Windows.Forms.Primitives/tests/UnitTests/System/Windows/Forms/Automation/UiaTextRangeTests.cs
@@ -8,7 +8,6 @@
using Windows.Win32.System.Variant;
using Windows.Win32.UI.Accessibility;
using InteropUiaIRawElementProviderSimple = Interop.UiaCore.IRawElementProviderSimple;
-using ProviderOptions = Interop.UiaCore.ProviderOptions;
namespace System.Windows.Forms.Primitives.Tests.Automation;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/AccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/AccessibleObject.cs
index 2f0b0f84a58..6154ac78fee 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/AccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/AccessibleObject.cs
@@ -425,7 +425,7 @@ internal virtual int[] RuntimeId
}
internal virtual int ProviderOptions
- => (int)(UiaCore.ProviderOptions.ServerSideProvider | UiaCore.ProviderOptions.UseComThreading);
+ => (int)(UIA.ProviderOptions.ProviderOptions_ServerSideProvider | UIA.ProviderOptions.ProviderOptions_UseComThreading);
internal virtual UiaCore.IRawElementProviderSimple? HostRawElementProvider => null;
@@ -538,7 +538,7 @@ private bool IsInvokePatternAvailable
///
/// Indicates the direction in which to navigate.
/// The element in the specified direction if it exists.
- internal virtual UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) => null;
+ internal virtual UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) => null;
internal virtual UiaCore.IRawElementProviderSimple[]? GetEmbeddedFragmentRoots() => null;
@@ -571,13 +571,13 @@ internal virtual void Collapse()
{
}
- internal virtual UiaCore.ExpandCollapseState ExpandCollapseState => UiaCore.ExpandCollapseState.Collapsed;
+ internal virtual UIA.ExpandCollapseState ExpandCollapseState => UIA.ExpandCollapseState.ExpandCollapseState_Collapsed;
internal virtual void Toggle()
{
}
- internal virtual UiaCore.ToggleState ToggleState => UiaCore.ToggleState.Indeterminate;
+ internal virtual ToggleState ToggleState => ToggleState.ToggleState_Indeterminate;
private protected virtual UiaCore.IRawElementProviderFragmentRoot? ToolStripFragmentRoot => null;
@@ -585,7 +585,7 @@ internal virtual void Toggle()
internal virtual UiaCore.IRawElementProviderSimple[]? GetColumnHeaders() => null;
- internal virtual UiaCore.RowOrColumnMajor RowOrColumnMajor => UiaCore.RowOrColumnMajor.RowMajor;
+ internal virtual RowOrColumnMajor RowOrColumnMajor => RowOrColumnMajor.RowOrColumnMajor_RowMajor;
internal virtual UiaCore.IRawElementProviderSimple[]? GetRowHeaderItems() => null;
@@ -766,7 +766,7 @@ unsafe HRESULT UiaCore.IAccessibleEx.ConvertReturnedElement(UiaCore.IRawElementP
return HRESULT.E_NOTIMPL;
}
- UiaCore.ProviderOptions UiaCore.IRawElementProviderSimple.ProviderOptions => (UiaCore.ProviderOptions)ProviderOptions;
+ ProviderOptions UiaCore.IRawElementProviderSimple.ProviderOptions => (ProviderOptions)ProviderOptions;
UiaCore.IRawElementProviderSimple? UiaCore.IRawElementProviderSimple.HostRawElementProvider => HostRawElementProvider;
@@ -801,7 +801,7 @@ unsafe HRESULT UiaCore.IAccessibleEx.ConvertReturnedElement(UiaCore.IRawElementP
return value;
}
- object? UiaCore.IRawElementProviderFragment.Navigate(UiaCore.NavigateDirection direction) => FragmentNavigate(direction);
+ object? UiaCore.IRawElementProviderFragment.Navigate(NavigateDirection direction) => FragmentNavigate(direction);
int[]? UiaCore.IRawElementProviderFragment.GetRuntimeId() => RuntimeId;
@@ -887,7 +887,7 @@ UiaCore.IRawElementProviderSimple[] UiaCore.ILegacyIAccessibleProvider.GetSelect
void UiaCore.IExpandCollapseProvider.Collapse() => Collapse();
- UiaCore.ExpandCollapseState UiaCore.IExpandCollapseProvider.ExpandCollapseState => ExpandCollapseState;
+ UIA.ExpandCollapseState UiaCore.IExpandCollapseProvider.ExpandCollapseState => ExpandCollapseState;
void UiaCore.IInvokeProvider.Invoke() => Invoke();
@@ -932,13 +932,13 @@ HRESULT ITextProvider2.Interface.RangeFromAnnotation(IRawElementProviderSimple*
void UiaCore.IToggleProvider.Toggle() => Toggle();
- UiaCore.ToggleState UiaCore.IToggleProvider.ToggleState => ToggleState;
+ ToggleState UiaCore.IToggleProvider.ToggleState => ToggleState;
object[]? UiaCore.ITableProvider.GetRowHeaders() => GetRowHeaders();
object[]? UiaCore.ITableProvider.GetColumnHeaders() => GetColumnHeaders();
- UiaCore.RowOrColumnMajor UiaCore.ITableProvider.RowOrColumnMajor => RowOrColumnMajor;
+ RowOrColumnMajor UiaCore.ITableProvider.RowOrColumnMajor => RowOrColumnMajor;
object[]? UiaCore.ITableItemProvider.GetRowHeaderItems() => GetRowHeaderItems();
@@ -2230,7 +2230,7 @@ public virtual bool RaiseLiveRegionChanged()
internal virtual bool RaiseAutomationEvent(UIA_EVENT_ID eventId)
{
- if (UiaCore.UiaClientsAreListening() && CanNotifyClients)
+ if (PInvoke.UiaClientsAreListening() && CanNotifyClients)
{
HRESULT result = UiaCore.UiaRaiseAutomationEvent(this, eventId);
return result == HRESULT.S_OK;
@@ -2241,7 +2241,7 @@ internal virtual bool RaiseAutomationEvent(UIA_EVENT_ID eventId)
internal virtual bool RaiseAutomationPropertyChangedEvent(UIA_PROPERTY_ID propertyId, object? oldValue, object? newValue)
{
- if (UiaCore.UiaClientsAreListening() && CanNotifyClients)
+ if (PInvoke.UiaClientsAreListening() && CanNotifyClients)
{
HRESULT result = UiaCore.UiaRaiseAutomationPropertyChangedEvent(this, propertyId, oldValue, newValue);
return result == HRESULT.S_OK;
@@ -2255,7 +2255,7 @@ internal virtual bool InternalRaiseAutomationNotification(
AutomationNotificationProcessing notificationProcessing,
string notificationText)
{
- if (UiaCore.UiaClientsAreListening())
+ if (PInvoke.UiaClientsAreListening())
{
return RaiseAutomationNotification(notificationKind, notificationProcessing, notificationText);
}
@@ -2263,9 +2263,9 @@ internal virtual bool InternalRaiseAutomationNotification(
return s_notificationEventAvailable;
}
- internal bool RaiseStructureChangedEvent(UiaCore.StructureChangeType structureChangeType, int[] runtimeId)
+ internal bool RaiseStructureChangedEvent(StructureChangeType structureChangeType, int[] runtimeId)
{
- if (UiaCore.UiaClientsAreListening() && CanNotifyClients)
+ if (PInvoke.UiaClientsAreListening() && CanNotifyClients)
{
HRESULT result = UiaCore.UiaRaiseStructureChangedEvent(this, structureChangeType, runtimeId, runtimeId is null ? 0 : runtimeId.Length);
return result == HRESULT.S_OK;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/CheckBox.CheckBoxAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/CheckBox.CheckBoxAccessibleObject.cs
index d5e5469ecc6..8b0a0462329 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/CheckBox.CheckBoxAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/CheckBox.CheckBoxAccessibleObject.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
using Windows.Win32.UI.Accessibility;
-using static Interop;
namespace System.Windows.Forms;
@@ -32,15 +31,15 @@ public override AccessibleStates State
_ => base.State
};
- internal override UiaCore.ToggleState ToggleState
+ internal override ToggleState ToggleState
=> this.TryGetOwnerAs(out CheckBox? owner)
? owner.CheckState switch
{
- CheckState.Checked => UiaCore.ToggleState.On,
- CheckState.Unchecked => UiaCore.ToggleState.Off,
- _ => UiaCore.ToggleState.Indeterminate,
+ CheckState.Checked => ToggleState.ToggleState_On,
+ CheckState.Unchecked => ToggleState.ToggleState_Off,
+ _ => ToggleState.ToggleState_Indeterminate,
}
- : UiaCore.ToggleState.Off;
+ : ToggleState.ToggleState_Off;
internal override bool IsPatternSupported(UIA_PATTERN_ID patternId)
=> patternId switch
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/CheckedListBox.CheckedListBoxItemAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/CheckedListBox.CheckedListBoxItemAccessibleObject.cs
index b6a1a7a052b..41c596beeb6 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/CheckedListBox.CheckedListBoxItemAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/CheckedListBox.CheckedListBoxItemAccessibleObject.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
using Windows.Win32.UI.Accessibility;
-using static Interop;
namespace System.Windows.Forms;
@@ -107,18 +106,18 @@ public override AccessibleStates State
internal override void Toggle() => DoDefaultAction();
- internal override UiaCore.ToggleState ToggleState
+ internal override ToggleState ToggleState
{
get
{
- UiaCore.ToggleState toggleState= UiaCore.ToggleState.Off;
+ ToggleState toggleState= ToggleState.ToggleState_Off;
switch (_owningCheckedListBox.GetItemCheckState(CurrentIndex))
{
case CheckState.Checked:
- toggleState = UiaCore.ToggleState.On;
+ toggleState = ToggleState.ToggleState_On;
break;
case CheckState.Indeterminate:
- toggleState = UiaCore.ToggleState.Indeterminate;
+ toggleState = ToggleState.ToggleState_Indeterminate;
break;
}
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.ComboBoxAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.ComboBoxAccessibleObject.cs
index b0f55f1ec0d..32062995ecc 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.ComboBoxAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.ComboBoxAccessibleObject.cs
@@ -59,10 +59,10 @@ internal override int[] RuntimeId
internal override void Collapse() => ComboBoxDefaultAction(false);
- internal override UiaCore.ExpandCollapseState ExpandCollapseState
+ internal override ExpandCollapseState ExpandCollapseState
=> this.IsOwnerHandleCreated(out ComboBox? owner) && owner.DroppedDown
- ? UiaCore.ExpandCollapseState.Expanded
- : UiaCore.ExpandCollapseState.Collapsed;
+ ? ExpandCollapseState.ExpandCollapseState_Expanded
+ : ExpandCollapseState.ExpandCollapseState_Collapsed;
internal override string? get_accNameInternal(object childID)
{
@@ -98,7 +98,7 @@ internal override UiaCore.ExpandCollapseState ExpandCollapseState
public ComboBoxChildDropDownButtonUiaProvider? DropDownButtonUiaProvider
=> _dropDownButtonUiaProvider ??= this.TryGetOwnerAs(out ComboBox? owner) ? new ComboBoxChildDropDownButtonUiaProvider(owner) : null;
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
{
if (!this.IsOwnerHandleCreated(out ComboBox? _))
{
@@ -107,9 +107,9 @@ public ComboBoxChildDropDownButtonUiaProvider? DropDownButtonUiaProvider
switch (direction)
{
- case UiaCore.NavigateDirection.FirstChild:
+ case NavigateDirection.NavigateDirection_FirstChild:
return GetFirstChild();
- case UiaCore.NavigateDirection.LastChild:
+ case NavigateDirection.NavigateDirection_LastChild:
return GetLastChild();
default:
return base.FragmentNavigate(direction);
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.ComboBoxChildDropDownButtonUiaProvider.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.ComboBoxChildDropDownButtonUiaProvider.cs
index 428735a3e86..26bff9f4d3f 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.ComboBoxChildDropDownButtonUiaProvider.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.ComboBoxChildDropDownButtonUiaProvider.cs
@@ -43,7 +43,7 @@ public ComboBoxChildDropDownButtonUiaProvider(ComboBox owner)
public override unsafe string? DefaultAction => SystemIAccessible.TryGetDefaultAction(GetChildId());
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
{
if (!_owner.IsHandleCreated)
{
@@ -52,13 +52,13 @@ public ComboBoxChildDropDownButtonUiaProvider(ComboBox owner)
return direction switch
{
- UiaCore.NavigateDirection.Parent => _owner.AccessibilityObject,
- UiaCore.NavigateDirection.PreviousSibling =>
+ NavigateDirection.NavigateDirection_Parent => _owner.AccessibilityObject,
+ NavigateDirection.NavigateDirection_PreviousSibling =>
_owner.DropDownStyle == ComboBoxStyle.DropDownList
? _owner.ChildTextAccessibleObject
: _owner.ChildEditAccessibleObject,
// We should return null for NextSibling because it is always the last item in the tree
- UiaCore.NavigateDirection.NextSibling => null,
+ NavigateDirection.NavigateDirection_NextSibling => null,
_ => base.FragmentNavigate(direction)
};
}
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.ComboBoxChildEditUiaProvider.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.ComboBoxChildEditUiaProvider.cs
index 62034bb9a1c..bcadec73ee8 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.ComboBoxChildEditUiaProvider.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.ComboBoxChildEditUiaProvider.cs
@@ -40,7 +40,7 @@ public ComboBoxChildEditUiaProvider(ComboBox owner, IntPtr childEditControlhandl
///
/// Indicates the direction in which to navigate.
/// Returns the element in the specified direction.
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
{
if (!_owningComboBox.IsHandleCreated ||
// Created is set to false in WM_DESTROY, but the window Handle is released on NCDESTROY, which comes after DESTROY.
@@ -52,13 +52,13 @@ public ComboBoxChildEditUiaProvider(ComboBox owner, IntPtr childEditControlhandl
switch (direction)
{
- case UiaCore.NavigateDirection.Parent:
+ case NavigateDirection.NavigateDirection_Parent:
return _owningComboBox.AccessibilityObject;
- case UiaCore.NavigateDirection.PreviousSibling:
+ case NavigateDirection.NavigateDirection_PreviousSibling:
return _owningComboBox.DroppedDown
? _owningComboBox.ChildListAccessibleObject
: null;
- case UiaCore.NavigateDirection.NextSibling:
+ case NavigateDirection.NavigateDirection_NextSibling:
return _owningComboBox.DropDownStyle != ComboBoxStyle.Simple
&& _owningComboBox.AccessibilityObject is ComboBoxAccessibleObject comboBoxAccessibleObject
? comboBoxAccessibleObject.DropDownButtonUiaProvider
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.ComboBoxChildListUiaProvider.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.ComboBoxChildListUiaProvider.cs
index 08107b99d2b..8a6841dc7d4 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.ComboBoxChildListUiaProvider.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.ComboBoxChildListUiaProvider.cs
@@ -59,7 +59,7 @@ internal override Rectangle BoundingRectangle
return base.ElementProviderFromPoint(x, y);
}
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
{
if (!_owningComboBox.IsHandleCreated ||
// Created is set to false in WM_DESTROY, but the window Handle is released on NCDESTROY, which comes after DESTROY.
@@ -71,11 +71,11 @@ internal override Rectangle BoundingRectangle
switch (direction)
{
- case UiaCore.NavigateDirection.Parent:
+ case NavigateDirection.NavigateDirection_Parent:
return _owningComboBox.AccessibilityObject;
- case UiaCore.NavigateDirection.FirstChild:
+ case NavigateDirection.NavigateDirection_FirstChild:
return GetChildFragment(0);
- case UiaCore.NavigateDirection.LastChild:
+ case NavigateDirection.NavigateDirection_LastChild:
var childFragmentCount = GetChildFragmentCount();
if (childFragmentCount > 0)
{
@@ -83,11 +83,11 @@ internal override Rectangle BoundingRectangle
}
return null;
- case UiaCore.NavigateDirection.NextSibling:
+ case NavigateDirection.NavigateDirection_NextSibling:
return _owningComboBox.DropDownStyle == ComboBoxStyle.DropDownList
? _owningComboBox.ChildTextAccessibleObject
: _owningComboBox.ChildEditAccessibleObject;
- case UiaCore.NavigateDirection.PreviousSibling:
+ case NavigateDirection.NavigateDirection_PreviousSibling:
// A workaround for an issue with an Inspect not responding. It also simulates native control behavior.
return _owningComboBox.DropDownStyle == ComboBoxStyle.Simple
? _owningComboBox.ChildListAccessibleObject
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.ComboBoxChildTextUiaProvider.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.ComboBoxChildTextUiaProvider.cs
index aefcf637e17..92bda080c5d 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.ComboBoxChildTextUiaProvider.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.ComboBoxChildTextUiaProvider.cs
@@ -68,7 +68,7 @@ public override string Name
///
/// Indicates the direction in which to navigate.
/// Returns the element in the specified direction.
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
{
if (!_owner.IsHandleCreated)
{
@@ -77,13 +77,13 @@ public override string Name
switch (direction)
{
- case UiaCore.NavigateDirection.Parent:
+ case NavigateDirection.NavigateDirection_Parent:
return _owner.AccessibilityObject;
- case UiaCore.NavigateDirection.NextSibling:
+ case NavigateDirection.NavigateDirection_NextSibling:
return _owner.AccessibilityObject is ComboBoxAccessibleObject comboBoxAccessibleObject
? comboBoxAccessibleObject.DropDownButtonUiaProvider
: null;
- case UiaCore.NavigateDirection.PreviousSibling:
+ case NavigateDirection.NavigateDirection_PreviousSibling:
return _owner.DroppedDown
? _owner.ChildListAccessibleObject
: null;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.ComboBoxItemAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.ComboBoxItemAccessibleObject.cs
index 9064eae8987..9e78ce732cf 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.ComboBoxItemAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.ComboBoxItemAccessibleObject.cs
@@ -58,9 +58,9 @@ public override Rectangle Bounds
public override string? DefaultAction
=> _owningComboBox.ChildListAccessibleObject.SystemIAccessible.TryGetDefaultAction(GetChildId());
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
{
- if (direction == UiaCore.NavigateDirection.Parent)
+ if (direction == NavigateDirection.NavigateDirection_Parent)
{
return _owningComboBox.ChildListAccessibleObject;
}
@@ -72,7 +72,7 @@ public override string? DefaultAction
switch (direction)
{
- case UiaCore.NavigateDirection.NextSibling:
+ case NavigateDirection.NavigateDirection_NextSibling:
int currentIndex = GetCurrentIndex();
int itemsCount = comboBoxChildListUiaProvider.GetChildFragmentCount();
int nextItemIndex = currentIndex + 1;
@@ -82,7 +82,7 @@ public override string? DefaultAction
}
break;
- case UiaCore.NavigateDirection.PreviousSibling:
+ case NavigateDirection.NavigateDirection_PreviousSibling:
currentIndex = GetCurrentIndex();
int previousItemIndex = currentIndex - 1;
if (previousItemIndex >= 0)
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.cs
index 77790c98f58..63afd4fbf04 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ComboBox.cs
@@ -2566,8 +2566,8 @@ protected virtual void OnDropDown(EventArgs e)
{
AccessibilityObject.RaiseAutomationPropertyChangedEvent(
UIA_PROPERTY_ID.UIA_ExpandCollapseExpandCollapseStatePropertyId,
- UiaCore.ExpandCollapseState.Collapsed,
- UiaCore.ExpandCollapseState.Expanded);
+ ExpandCollapseState.ExpandCollapseState_Collapsed,
+ ExpandCollapseState.ExpandCollapseState_Expanded);
if (AccessibilityObject is ComboBoxAccessibleObject accessibleObject)
{
@@ -3057,8 +3057,8 @@ protected virtual void OnDropDownClosed(EventArgs e)
// Notify Collapsed/expanded property change.
AccessibilityObject.RaiseAutomationPropertyChangedEvent(
UIA_PROPERTY_ID.UIA_ExpandCollapseExpandCollapseStatePropertyId,
- UiaCore.ExpandCollapseState.Expanded,
- UiaCore.ExpandCollapseState.Collapsed);
+ ExpandCollapseState.ExpandCollapseState_Expanded,
+ ExpandCollapseState.ExpandCollapseState_Collapsed);
}
// Collapsing the DropDown, so reset the flag.
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Control.ControlAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Control.ControlAccessibleObject.cs
index b6b7a2bfc74..7cd1b7ca3fd 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Control.ControlAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Control.ControlAccessibleObject.cs
@@ -60,16 +60,16 @@ private protected override string AutomationId
// If the control is used as an item of a ToolStrip via ToolStripControlHost,
// its accessible object should provide info about the owning ToolStrip and items-siblings
// to build a correct ToolStrip accessibility tree.
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
{
if (!this.TryGetOwnerAs(out Control? owner) || owner.ToolStripControlHost is not ToolStripControlHost host)
{
return base.FragmentNavigate(direction);
}
- if (direction == UiaCore.NavigateDirection.Parent
- || direction == UiaCore.NavigateDirection.PreviousSibling
- || direction == UiaCore.NavigateDirection.NextSibling)
+ if (direction == NavigateDirection.NavigateDirection_Parent
+ || direction == NavigateDirection.NavigateDirection_PreviousSibling
+ || direction == NavigateDirection.NavigateDirection_NextSibling)
{
return host.AccessibilityObject.FragmentNavigate(direction);
}
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridView.AccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridView.AccessibleObject.cs
index fcfb67ad31e..6b53cd85055 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridView.AccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridView.AccessibleObject.cs
@@ -342,11 +342,11 @@ internal override bool IsPatternSupported(UIA_PATTERN_ID patternId)
return result;
}
- internal override UiaCore.RowOrColumnMajor RowOrColumnMajor
+ internal override RowOrColumnMajor RowOrColumnMajor
{
get
{
- return UiaCore.RowOrColumnMajor.RowMajor;
+ return RowOrColumnMajor.RowOrColumnMajor_RowMajor;
}
}
@@ -394,11 +394,11 @@ internal override UiaCore.IRawElementProviderFragmentRoot FragmentRoot
}
}
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
{
switch (direction)
{
- case UiaCore.NavigateDirection.FirstChild:
+ case NavigateDirection.NavigateDirection_FirstChild:
int childCount = GetChildCount();
if (childCount > 0)
{
@@ -406,7 +406,7 @@ internal override UiaCore.IRawElementProviderFragmentRoot FragmentRoot
}
break;
- case UiaCore.NavigateDirection.LastChild:
+ case NavigateDirection.NavigateDirection_LastChild:
childCount = GetChildCount();
if (childCount > 0)
{
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridView.DataGridViewEditingPanelAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridView.DataGridViewEditingPanelAccessibleObject.cs
index 59ce652bf1e..037335a2c06 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridView.DataGridViewEditingPanelAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridView.DataGridViewEditingPanelAccessibleObject.cs
@@ -30,7 +30,7 @@ internal override UiaCore.IRawElementProviderFragmentRoot FragmentRoot
internal override int[] RuntimeId
=> _runtimeId ??= this.TryGetOwnerAs(out Panel? owner) ? owner.AccessibilityObject.RuntimeId : base.RuntimeId;
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
{
if (!_ownerDataGridView.TryGetTarget(out var owner))
{
@@ -39,7 +39,7 @@ internal override int[] RuntimeId
switch (direction)
{
- case UiaCore.NavigateDirection.Parent:
+ case NavigateDirection.NavigateDirection_Parent:
DataGridViewCell? currentCell = owner.CurrentCell;
if (currentCell is not null && owner.IsCurrentCellInEditMode)
{
@@ -47,8 +47,8 @@ internal override int[] RuntimeId
}
break;
- case UiaCore.NavigateDirection.FirstChild:
- case UiaCore.NavigateDirection.LastChild:
+ case NavigateDirection.NavigateDirection_FirstChild:
+ case NavigateDirection.NavigateDirection_LastChild:
return owner.EditingControlAccessibleObject;
}
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridView.Methods.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridView.Methods.cs
index 9f3d67e5a64..fa10862b7d0 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridView.Methods.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridView.Methods.cs
@@ -11,6 +11,7 @@
using System.Windows.Forms.Layout;
using System.Windows.Forms.VisualStyles;
using Microsoft.Win32;
+using Windows.Win32.UI.Accessibility;
using static Interop;
namespace System.Windows.Forms;
@@ -28039,7 +28040,7 @@ internal void SetAccessibleObjectParent(AccessibleObject editingControlAccessibl
editingControlAccessibleObject.SetParent(CurrentCell.AccessibilityObject);
CurrentCell.AccessibilityObject.SetDetachableChild(editingControlAccessibleObject);
- CurrentCell.AccessibilityObject.RaiseStructureChangedEvent(UiaCore.StructureChangeType.ChildAdded, editingControlAccessibleObject.RuntimeId);
+ CurrentCell.AccessibilityObject.RaiseStructureChangedEvent(StructureChangeType.StructureChangeType_ChildAdded, editingControlAccessibleObject.RuntimeId);
}
private bool SetAndSelectCurrentCellAddress(int columnIndex,
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridView.TopRowAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridView.TopRowAccessibleObject.cs
index 320e0e742d7..a6a387be1a9 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridView.TopRowAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridView.TopRowAccessibleObject.cs
@@ -210,13 +210,13 @@ internal override UiaCore.IRawElementProviderFragmentRoot FragmentRoot
}
[return: MarshalAs(UnmanagedType.IUnknown)]
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
{
switch (direction)
{
- case UiaCore.NavigateDirection.Parent:
+ case NavigateDirection.NavigateDirection_Parent:
return Parent;
- case UiaCore.NavigateDirection.NextSibling:
+ case NavigateDirection.NavigateDirection_NextSibling:
if (Parent.GetChildCount() > 1)
{
if (_ownerDataGridView is null)
@@ -228,14 +228,14 @@ internal override UiaCore.IRawElementProviderFragmentRoot FragmentRoot
}
break;
- case UiaCore.NavigateDirection.FirstChild:
+ case NavigateDirection.NavigateDirection_FirstChild:
if (GetChildCount() > 0)
{
return GetChild(0);
}
break;
- case UiaCore.NavigateDirection.LastChild:
+ case NavigateDirection.NavigateDirection_LastChild:
if (GetChildCount() > 0)
{
return GetChild(GetChildCount() - 1);
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewCell.DataGridViewCellAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewCell.DataGridViewCellAccessibleObject.cs
index f6a44bfc3a0..06682b122e5 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewCell.DataGridViewCellAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewCell.DataGridViewCellAccessibleObject.cs
@@ -623,7 +623,7 @@ private protected override string AutomationId
internal override UiaCore.IRawElementProviderFragmentRoot? FragmentRoot
=> _owner?.DataGridView?.AccessibilityObject;
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
{
if (_owner is null)
{
@@ -637,17 +637,17 @@ internal override UiaCore.IRawElementProviderFragmentRoot? FragmentRoot
switch (direction)
{
- case UiaCore.NavigateDirection.Parent:
+ case NavigateDirection.NavigateDirection_Parent:
return _owner.OwningRow.AccessibilityObject;
- case UiaCore.NavigateDirection.NextSibling:
+ case NavigateDirection.NavigateDirection_NextSibling:
return NavigateForward(wrapAround: false);
- case UiaCore.NavigateDirection.PreviousSibling:
+ case NavigateDirection.NavigateDirection_PreviousSibling:
return NavigateBackward(wrapAround: false);
- case UiaCore.NavigateDirection.FirstChild:
- case UiaCore.NavigateDirection.LastChild:
+ case NavigateDirection.NavigateDirection_FirstChild:
+ case NavigateDirection.NavigateDirection_LastChild:
if (_owner.DataGridView.CurrentCell == _owner &&
_owner.DataGridView.IsCurrentCellInEditMode &&
_owner.DataGridView.EditingControl is not null)
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewCell.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewCell.cs
index dff0895b503..c8386968960 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewCell.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewCell.cs
@@ -5,6 +5,7 @@
using System.Drawing;
using System.Globalization;
using System.Text;
+using Windows.Win32.UI.Accessibility;
using static Interop;
namespace System.Windows.Forms;
@@ -1131,7 +1132,7 @@ public virtual void DetachEditingControl()
dataGridView.EditingControlAccessibleObject!.SetParent(null);
AccessibilityObject.SetDetachableChild(null);
- AccessibilityObject.RaiseStructureChangedEvent(UiaCore.StructureChangeType.ChildRemoved, dataGridView.EditingControlAccessibleObject.RuntimeId);
+ AccessibilityObject.RaiseStructureChangedEvent(StructureChangeType.StructureChangeType_ChildRemoved, dataGridView.EditingControlAccessibleObject.RuntimeId);
}
}
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewCheckBoxCell.DataGridViewCheckBoxCellAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewCheckBoxCell.DataGridViewCheckBoxCellAccessibleObject.cs
index 3db3bc39243..b93f26d02fc 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewCheckBoxCell.DataGridViewCheckBoxCellAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewCheckBoxCell.DataGridViewCheckBoxCellAccessibleObject.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
using Windows.Win32.UI.Accessibility;
-using static Interop;
namespace System.Windows.Forms;
@@ -149,7 +148,7 @@ public override void DoDefaultAction()
internal override void Toggle() => DoDefaultAction();
- internal override UiaCore.ToggleState ToggleState
+ internal override ToggleState ToggleState
{
get
{
@@ -160,9 +159,9 @@ internal override UiaCore.ToggleState ToggleState
return ((Owner as DataGridViewCheckBoxCell)?.CheckState) switch
{
- CheckState.Checked => UiaCore.ToggleState.On,
- CheckState.Unchecked => UiaCore.ToggleState.Off,
- _ => UiaCore.ToggleState.Indeterminate,
+ CheckState.Checked => ToggleState.ToggleState_On,
+ CheckState.Unchecked => ToggleState.ToggleState_Off,
+ _ => ToggleState.ToggleState_Indeterminate,
};
}
}
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewColumnHeaderCell.DataGridViewColumnHeaderCellAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewColumnHeaderCell.DataGridViewColumnHeaderCellAccessibleObject.cs
index 479db717525..3e5d3856d25 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewColumnHeaderCell.DataGridViewColumnHeaderCellAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewColumnHeaderCell.DataGridViewColumnHeaderCellAccessibleObject.cs
@@ -242,7 +242,7 @@ public override void Select(AccessibleSelection flags)
#region IRawElementProviderFragment Implementation
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
{
if (Owner is null)
{
@@ -251,9 +251,9 @@ public override void Select(AccessibleSelection flags)
return direction switch
{
- UiaCore.NavigateDirection.Parent => Parent,
- UiaCore.NavigateDirection.NextSibling => NavigateForward(),
- UiaCore.NavigateDirection.PreviousSibling => NavigateBackward(),
+ NavigateDirection.NavigateDirection_Parent => Parent,
+ NavigateDirection.NavigateDirection_NextSibling => NavigateForward(),
+ NavigateDirection.NavigateDirection_PreviousSibling => NavigateBackward(),
_ => null
};
}
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewComboBoxCell.DataGridViewComboBoxCellAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewComboBoxCell.DataGridViewComboBoxCellAccessibleObject.cs
index 9df2c91a46c..238d966dd39 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewComboBoxCell.DataGridViewComboBoxCellAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewComboBoxCell.DataGridViewComboBoxCellAccessibleObject.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
using Windows.Win32.UI.Accessibility;
-using static Interop;
namespace System.Windows.Forms;
@@ -35,7 +34,7 @@ internal override bool IsPatternSupported(UIA_PATTERN_ID patternId)
_ => base.IsPatternSupported(patternId)
};
- internal override UiaCore.ExpandCollapseState ExpandCollapseState
+ internal override ExpandCollapseState ExpandCollapseState
{
get
{
@@ -46,10 +45,10 @@ internal override UiaCore.ExpandCollapseState ExpandCollapseState
if (Owner.Properties.GetObject(s_propComboBoxCellEditingComboBox) is DataGridViewComboBoxEditingControl comboBox && comboBox.IsHandleCreated)
{
- return comboBox.DroppedDown ? UiaCore.ExpandCollapseState.Expanded : UiaCore.ExpandCollapseState.Collapsed;
+ return comboBox.DroppedDown ? ExpandCollapseState.ExpandCollapseState_Expanded : ExpandCollapseState.ExpandCollapseState_Collapsed;
}
- return UiaCore.ExpandCollapseState.Collapsed;
+ return ExpandCollapseState.ExpandCollapseState_Collapsed;
}
}
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewComboBoxEditingControl.DataGridViewComboBoxEditingControlAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewComboBoxEditingControl.DataGridViewComboBoxEditingControlAccessibleObject.cs
index fe8c57d7bb5..0e704f4fb82 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewComboBoxEditingControl.DataGridViewComboBoxEditingControlAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewComboBoxEditingControl.DataGridViewComboBoxEditingControlAccessibleObject.cs
@@ -27,11 +27,11 @@ public DataGridViewComboBoxEditingControlAccessibleObject(DataGridViewComboBoxEd
public override AccessibleObject? Parent => _parentAccessibleObject;
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
{
switch (direction)
{
- case UiaCore.NavigateDirection.Parent:
+ case NavigateDirection.NavigateDirection_Parent:
if (this.TryGetOwnerAs(out Control? owner) && owner is IDataGridViewEditingControl editingControl
&& editingControl.EditingControlDataGridView?.EditingControl == owner
&& owner.ToolStripControlHost is null)
@@ -57,10 +57,10 @@ UIA_PATTERN_ID.UIA_ExpandCollapsePatternId when this.TryGetOwnerAs(out DataGridV
_ => base.IsPatternSupported(patternId)
};
- internal override UiaCore.ExpandCollapseState ExpandCollapseState
+ internal override ExpandCollapseState ExpandCollapseState
=> this.TryGetOwnerAs(out DataGridViewComboBoxEditingControl? owner) && owner.DroppedDown
- ? UiaCore.ExpandCollapseState.Expanded
- : UiaCore.ExpandCollapseState.Collapsed;
+ ? ExpandCollapseState.ExpandCollapseState_Expanded
+ : ExpandCollapseState.ExpandCollapseState_Collapsed;
///
/// Sets the parent accessible object for the node which can be added or removed to/from hierarchy nodes.
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewRow.DataGridViewRowAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewRow.DataGridViewRowAccessibleObject.cs
index 49e462b3b26..f6bf6c45507 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewRow.DataGridViewRowAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewRow.DataGridViewRowAccessibleObject.cs
@@ -441,7 +441,7 @@ public override void Select(AccessibleSelection flags)
}
}
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
{
{
if (Owner is null)
@@ -451,15 +451,15 @@ public override void Select(AccessibleSelection flags)
switch (direction)
{
- case UiaCore.NavigateDirection.Parent:
+ case NavigateDirection.NavigateDirection_Parent:
return Parent;
- case UiaCore.NavigateDirection.NextSibling:
+ case NavigateDirection.NavigateDirection_NextSibling:
return Navigate(AccessibleNavigation.Next);
- case UiaCore.NavigateDirection.PreviousSibling:
+ case NavigateDirection.NavigateDirection_PreviousSibling:
return Navigate(AccessibleNavigation.Previous);
- case UiaCore.NavigateDirection.FirstChild:
+ case NavigateDirection.NavigateDirection_FirstChild:
return Navigate(AccessibleNavigation.FirstChild);
- case UiaCore.NavigateDirection.LastChild:
+ case NavigateDirection.NavigateDirection_LastChild:
return Navigate(AccessibleNavigation.LastChild);
default:
return null;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewRowHeaderCell.DataGridViewRowHeaderCellAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewRowHeaderCell.DataGridViewRowHeaderCellAccessibleObject.cs
index 2d8993a0bec..2fef9fe4e30 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewRowHeaderCell.DataGridViewRowHeaderCellAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewRowHeaderCell.DataGridViewRowHeaderCellAccessibleObject.cs
@@ -242,7 +242,7 @@ public override void Select(AccessibleSelection flags)
#region IRawElementProviderFragment Implementation
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
{
if (Owner is null)
{
@@ -256,8 +256,8 @@ public override void Select(AccessibleSelection flags)
return direction switch
{
- UiaCore.NavigateDirection.Parent => Owner.OwningRow.AccessibilityObject,
- UiaCore.NavigateDirection.NextSibling =>
+ NavigateDirection.NavigateDirection_Parent => Owner.OwningRow.AccessibilityObject,
+ NavigateDirection.NavigateDirection_NextSibling =>
(Owner.DataGridView is not null && Owner.DataGridView.Columns.GetColumnCount(DataGridViewElementStates.Visible) > 0)
? Owner.OwningRow.AccessibilityObject.GetChild(1) // go to the next sibling
: null,
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewTextBoxEditingControl.DataGridViewTextBoxEditingControlAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewTextBoxEditingControl.DataGridViewTextBoxEditingControlAccessibleObject.cs
index ecc2518eb58..dd3cdc5b2ae 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewTextBoxEditingControl.DataGridViewTextBoxEditingControlAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewTextBoxEditingControl.DataGridViewTextBoxEditingControlAccessibleObject.cs
@@ -30,11 +30,11 @@ internal void ClearParent()
public override string Name => this.GetOwnerAccessibleName(SR.DataGridView_AccEditingControlAccName);
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
{
switch (direction)
{
- case UiaCore.NavigateDirection.Parent:
+ case NavigateDirection.NavigateDirection_Parent:
if (this.TryGetOwnerAs(out Control? owner) && owner is IDataGridViewEditingControl editingControl
&& editingControl.EditingControlDataGridView?.EditingControl == owner
&& owner.ToolStripControlHost is null)
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewTopLeftHeaderCell.DataGridViewTopLeftHeaderCellAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewTopLeftHeaderCell.DataGridViewTopLeftHeaderCellAccessibleObject.cs
index bb3119be6a4..3eef24d9d46 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewTopLeftHeaderCell.DataGridViewTopLeftHeaderCellAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridViewTopLeftHeaderCell.DataGridViewTopLeftHeaderCellAccessibleObject.cs
@@ -259,7 +259,7 @@ public override void Select(AccessibleSelection flags)
}
#region IRawElementProviderFragment Implementation
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
{
if (Owner is null)
{
@@ -275,11 +275,11 @@ public override void Select(AccessibleSelection flags)
switch (direction)
{
- case UiaCore.NavigateDirection.Parent:
+ case NavigateDirection.NavigateDirection_Parent:
return dataGridView.AccessibilityObject.GetChild(0);
- case UiaCore.NavigateDirection.PreviousSibling:
+ case NavigateDirection.NavigateDirection_PreviousSibling:
return null;
- case UiaCore.NavigateDirection.NextSibling:
+ case NavigateDirection.NavigateDirection_NextSibling:
if (dataGridView.Columns.GetColumnCount(DataGridViewElementStates.Visible) == 0)
{
return null;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DateTimePicker.DateTimePickerAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DateTimePicker.DateTimePickerAccessibleObject.cs
index d8760dfec7f..1e328fe8688 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/DateTimePicker.DateTimePickerAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/DateTimePicker.DateTimePickerAccessibleObject.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
using Windows.Win32.UI.Accessibility;
-using static Interop;
namespace System.Windows.Forms;
@@ -93,8 +92,8 @@ UIA_PATTERN_ID.UIA_TogglePatternId when this.TryGetOwnerAs(out DateTimePicker? o
public override string DefaultAction
=> ExpandCollapseState switch
{
- UiaCore.ExpandCollapseState.Collapsed => SR.AccessibleActionExpand,
- UiaCore.ExpandCollapseState.Expanded => SR.AccessibleActionCollapse,
+ ExpandCollapseState.ExpandCollapseState_Collapsed => SR.AccessibleActionExpand,
+ ExpandCollapseState.ExpandCollapseState_Expanded => SR.AccessibleActionCollapse,
_ => string.Empty
};
@@ -102,17 +101,17 @@ public override void DoDefaultAction()
{
switch (ExpandCollapseState)
{
- case UiaCore.ExpandCollapseState.Collapsed:
+ case ExpandCollapseState.ExpandCollapseState_Collapsed:
Expand();
break;
- case UiaCore.ExpandCollapseState.Expanded:
+ case ExpandCollapseState.ExpandCollapseState_Expanded:
Collapse();
break;
}
}
- internal override UiaCore.ToggleState ToggleState
- => this.TryGetOwnerAs(out DateTimePicker? owner) && owner.Checked ? UiaCore.ToggleState.On : UiaCore.ToggleState.Off;
+ internal override ToggleState ToggleState
+ => this.TryGetOwnerAs(out DateTimePicker? owner) && owner.Checked ? ToggleState.ToggleState_On : ToggleState.ToggleState_Off;
internal override void Toggle()
{
@@ -125,7 +124,7 @@ internal override void Toggle()
internal override void Expand()
{
if (this.IsOwnerHandleCreated(out DateTimePicker? owner)
- && ExpandCollapseState == UiaCore.ExpandCollapseState.Collapsed)
+ && ExpandCollapseState == ExpandCollapseState.ExpandCollapseState_Collapsed)
{
PInvoke.SendMessage(owner, PInvoke.WM_SYSKEYDOWN, (WPARAM)(int)Keys.Down);
}
@@ -134,15 +133,15 @@ internal override void Expand()
internal override void Collapse()
{
if (this.IsOwnerHandleCreated(out DateTimePicker? owner)
- && ExpandCollapseState == UiaCore.ExpandCollapseState.Expanded)
+ && ExpandCollapseState == ExpandCollapseState.ExpandCollapseState_Expanded)
{
PInvoke.SendMessage(owner, PInvoke.DTM_CLOSEMONTHCAL);
}
}
- internal override UiaCore.ExpandCollapseState ExpandCollapseState
+ internal override ExpandCollapseState ExpandCollapseState
=> this.TryGetOwnerAs(out DateTimePicker? owner)
? owner._expandCollapseState
- : UiaCore.ExpandCollapseState.Collapsed;
+ : ExpandCollapseState.ExpandCollapseState_Collapsed;
}
}
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DateTimePicker.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DateTimePicker.cs
index d4374a6c48b..e3ae43273f9 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/DateTimePicker.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/DateTimePicker.cs
@@ -8,7 +8,6 @@
using Microsoft.Win32;
using SourceGenerated;
using Windows.Win32.UI.Accessibility;
-using static Interop;
namespace System.Windows.Forms;
@@ -52,7 +51,7 @@ public partial class DateTimePicker : Control
private EventHandler? _onValueChanged;
private EventHandler? _onRightToLeftLayoutChanged;
- private UiaCore.ExpandCollapseState _expandCollapseState;
+ private ExpandCollapseState _expandCollapseState;
// We need to restrict the available dates because of limitations in the comctl DateTime and MonthCalendar controls
@@ -1059,15 +1058,15 @@ protected override bool IsInputKey(Keys keyData)
protected virtual void OnCloseUp(EventArgs eventargs)
{
_onCloseUp?.Invoke(this, eventargs);
- _expandCollapseState = UiaCore.ExpandCollapseState.Collapsed;
+ _expandCollapseState = ExpandCollapseState.ExpandCollapseState_Collapsed;
// Raise automation event to annouce new state.
if (IsAccessibilityObjectCreated)
{
AccessibilityObject.RaiseAutomationPropertyChangedEvent(
UIA_PROPERTY_ID.UIA_ExpandCollapseExpandCollapseStatePropertyId,
- oldValue: UiaCore.ExpandCollapseState.Expanded,
- newValue: UiaCore.ExpandCollapseState.Collapsed);
+ oldValue: ExpandCollapseState.ExpandCollapseState_Expanded,
+ newValue: ExpandCollapseState.ExpandCollapseState_Collapsed);
}
}
@@ -1077,15 +1076,15 @@ protected virtual void OnCloseUp(EventArgs eventargs)
protected virtual void OnDropDown(EventArgs eventargs)
{
_onDropDown?.Invoke(this, eventargs);
- _expandCollapseState = UiaCore.ExpandCollapseState.Expanded;
+ _expandCollapseState = ExpandCollapseState.ExpandCollapseState_Expanded;
- // Raise automation event to annouce new state.
+ // Raise automation event to announce new state.
if (IsAccessibilityObjectCreated)
{
AccessibilityObject.RaiseAutomationPropertyChangedEvent(
UIA_PROPERTY_ID.UIA_ExpandCollapseExpandCollapseStatePropertyId,
- oldValue: UiaCore.ExpandCollapseState.Collapsed,
- newValue: UiaCore.ExpandCollapseState.Expanded);
+ oldValue: ExpandCollapseState.ExpandCollapseState_Collapsed,
+ newValue: ExpandCollapseState.ExpandCollapseState_Expanded);
}
}
@@ -1104,7 +1103,7 @@ protected override void OnGotFocus(EventArgs e)
// Raise automation event to annouce the control.
if (IsAccessibilityObjectCreated)
{
- _expandCollapseState = UiaCore.ExpandCollapseState.Collapsed;
+ _expandCollapseState = ExpandCollapseState.ExpandCollapseState_Collapsed;
AccessibilityObject.RaiseAutomationEvent(UIA_EVENT_ID.UIA_AutomationFocusChangedEventId);
}
}
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ErrorProvider.ControlItem.ControlItemAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ErrorProvider.ControlItem.ControlItemAccessibleObject.cs
index facde683880..8d5b875c386 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ErrorProvider.ControlItem.ControlItemAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ErrorProvider.ControlItem.ControlItemAccessibleObject.cs
@@ -44,15 +44,15 @@ public override Rectangle Bounds
///
/// Indicates the direction in which to navigate.
/// Returns the element in the specified direction.
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
{
switch (direction)
{
- case UiaCore.NavigateDirection.Parent:
+ case NavigateDirection.NavigateDirection_Parent:
return Parent;
- case UiaCore.NavigateDirection.NextSibling:
+ case NavigateDirection.NavigateDirection_NextSibling:
return GetNextSibling();
- case UiaCore.NavigateDirection.PreviousSibling:
+ case NavigateDirection.NavigateDirection_PreviousSibling:
return GetPreviousSibling();
default:
return base.FragmentNavigate(direction);
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ErrorProvider.ErrorWindow.ErrorWindowAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ErrorProvider.ErrorWindow.ErrorWindowAccessibleObject.cs
index 74141213680..c1e69ffa809 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ErrorProvider.ErrorWindow.ErrorWindowAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ErrorProvider.ErrorWindow.ErrorWindowAccessibleObject.cs
@@ -43,13 +43,13 @@ public ErrorWindowAccessibleObject(ErrorWindow owner)
///
/// Indicates the direction in which to navigate.
/// Returns the element in the specified direction.
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
{
switch (direction)
{
- case UiaCore.NavigateDirection.FirstChild:
+ case NavigateDirection.NavigateDirection_FirstChild:
return GetChild(0);
- case UiaCore.NavigateDirection.LastChild:
+ case NavigateDirection.NavigateDirection_LastChild:
return GetChild(GetChildCount() - 1);
}
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ErrorProvider.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ErrorProvider.cs
index 52629193d2d..a3f0770442d 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ErrorProvider.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ErrorProvider.cs
@@ -4,7 +4,6 @@
using System.ComponentModel;
using System.ComponentModel.Design;
using System.Drawing;
-using static Interop;
namespace System.Windows.Forms;
@@ -786,7 +785,7 @@ public void SetError(Control control, string? value)
{
EnsureControlItem(control).Error = value;
- if (UiaCore.UiaClientsAreListening())
+ if (PInvoke.UiaClientsAreListening())
{
control.AccessibilityObject.RaiseAutomationNotification(
Automation.AutomationNotificationKind.ActionAborted,
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/LabelEditAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/LabelEditAccessibleObject.cs
index 7b577ead0c3..97ccd9ad2a0 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/LabelEditAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/LabelEditAccessibleObject.cs
@@ -22,10 +22,10 @@ public LabelEditAccessibleObject(Control owningControl, LabelEditNativeWindow la
_textProvider = new(owningControl, labelEdit, this);
}
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
=> direction switch
{
- UiaCore.NavigateDirection.Parent => Parent,
+ NavigateDirection.NavigateDirection_Parent => Parent,
_ => base.FragmentNavigate(direction)
};
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/LabelEditNativeWindow.cs b/src/System.Windows.Forms/src/System/Windows/Forms/LabelEditNativeWindow.cs
index 32a7f46b697..36f8d578d2e 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/LabelEditNativeWindow.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/LabelEditNativeWindow.cs
@@ -37,7 +37,7 @@ public LabelEditNativeWindow(Control owningControl)
private unsafe void InstallWinEventHooks()
{
- if (!UiaCore.UiaClientsAreListening())
+ if (!PInvoke.UiaClientsAreListening())
{
return;
}
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/LinkLabel.Link.LinkAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/LinkLabel.Link.LinkAccessibleObject.cs
index fecb92d31e0..518aa2aec74 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/LinkLabel.Link.LinkAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/LinkLabel.Link.LinkAccessibleObject.cs
@@ -71,12 +71,12 @@ public override void DoDefaultAction()
_owningLinkLabel.OnLinkClicked(new LinkLabelLinkClickedEventArgs(_owningLink));
}
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
=> direction switch
{
- UiaCore.NavigateDirection.Parent => _linkLabelAccessibleObject,
- UiaCore.NavigateDirection.NextSibling => _linkLabelAccessibleObject.GetChild(CurrentIndex + 1),
- UiaCore.NavigateDirection.PreviousSibling => _linkLabelAccessibleObject.GetChild(CurrentIndex - 1),
+ NavigateDirection.NavigateDirection_Parent => _linkLabelAccessibleObject,
+ NavigateDirection.NavigateDirection_NextSibling => _linkLabelAccessibleObject.GetChild(CurrentIndex + 1),
+ NavigateDirection.NavigateDirection_PreviousSibling => _linkLabelAccessibleObject.GetChild(CurrentIndex - 1),
_ => base.FragmentNavigate(direction),
};
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/LinkLabel.LinkLabelAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/LinkLabel.LinkLabelAccessibleObject.cs
index 6f08ee2f461..f02cf1a3471 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/LinkLabel.LinkLabelAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/LinkLabel.LinkLabelAccessibleObject.cs
@@ -22,14 +22,14 @@ public LinkLabelAccessibleObject(LinkLabel owner) : base(owner)
? base.ElementProviderFromPoint(x, y)
: HitTest((int)x, (int)y) ?? base.ElementProviderFromPoint(x, y);
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
=> direction switch
{
- UiaCore.NavigateDirection.FirstChild
+ NavigateDirection.NavigateDirection_FirstChild
=> !this.TryGetOwnerAs(out LinkLabel? owner) ? null : owner.Links.Count != 0
? owner.Links[0].AccessibleObject
: null,
- UiaCore.NavigateDirection.LastChild
+ NavigateDirection.NavigateDirection_LastChild
=> !this.TryGetOwnerAs(out LinkLabel? owner) ? null : owner.Links.Count != 0
? owner.Links[^1].AccessibleObject
: null,
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ListBox.AccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ListBox.AccessibleObject.cs
index 2c1467d752f..cf16aaf0c3d 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ListBox.AccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ListBox.AccessibleObject.cs
@@ -96,7 +96,7 @@ private protected virtual ListBoxItemAccessibleObject CreateItemAccessibleObject
///
/// Indicates the direction in which to navigate.
/// Returns the element in the specified direction.
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
{
int childCount = this.TryGetOwnerAs(out ListBox? owner) ? owner.Items.Count : 0;
@@ -107,8 +107,8 @@ private protected virtual ListBoxItemAccessibleObject CreateItemAccessibleObject
return direction switch
{
- UiaCore.NavigateDirection.FirstChild => GetChild(0),
- UiaCore.NavigateDirection.LastChild => GetChild(childCount - 1),
+ NavigateDirection.NavigateDirection_FirstChild => GetChild(0),
+ NavigateDirection.NavigateDirection_LastChild => GetChild(childCount - 1),
_ => base.FragmentNavigate(direction),
};
}
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ListBox.ItemAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ListBox.ItemAccessibleObject.cs
index 60145fd5613..230cfb7ff77 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ListBox.ItemAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ListBox.ItemAccessibleObject.cs
@@ -128,7 +128,7 @@ public override void DoDefaultAction()
}
}
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
{
int firstItemIndex = 0;
int lastItemIndex = _owningListBox.Items.Count - 1;
@@ -136,16 +136,16 @@ public override void DoDefaultAction()
switch (direction)
{
- case UiaCore.NavigateDirection.Parent:
+ case NavigateDirection.NavigateDirection_Parent:
return _owningListBox.AccessibilityObject;
- case UiaCore.NavigateDirection.PreviousSibling:
+ case NavigateDirection.NavigateDirection_PreviousSibling:
if (currentIndex > firstItemIndex && currentIndex <= lastItemIndex)
{
return _owningAccessibleObject.GetChild(currentIndex - 1);
}
return null;
- case UiaCore.NavigateDirection.NextSibling:
+ case NavigateDirection.NavigateDirection_NextSibling:
if (currentIndex >= firstItemIndex && currentIndex < lastItemIndex)
{
return _owningAccessibleObject.GetChild(currentIndex + 1);
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ListView.ListViewAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ListView.ListViewAccessibleObject.cs
index 685bd422346..afa1a8c222c 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ListView.ListViewAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ListView.ListViewAccessibleObject.cs
@@ -64,8 +64,8 @@ internal bool OwnerHasDefaultGroup
internal override int RowCount
=> this.TryGetOwnerAs(out ListView? owningListView) ? owningListView.Items.Count : base.RowCount;
- internal override UiaCore.RowOrColumnMajor RowOrColumnMajor
- => UiaCore.RowOrColumnMajor.RowMajor;
+ internal override RowOrColumnMajor RowOrColumnMajor
+ => RowOrColumnMajor.RowOrColumnMajor_RowMajor;
internal override UiaCore.IRawElementProviderFragment? ElementProviderFromPoint(double x, double y)
{
@@ -74,7 +74,7 @@ internal override UiaCore.RowOrColumnMajor RowOrColumnMajor
return element ?? base.ElementProviderFromPoint(x, y);
}
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
{
if (!this.IsOwnerHandleCreated(out ListView? _))
{
@@ -83,8 +83,8 @@ internal override UiaCore.RowOrColumnMajor RowOrColumnMajor
return direction switch
{
- UiaCore.NavigateDirection.FirstChild => GetChild(0),
- UiaCore.NavigateDirection.LastChild => GetLastChild(),
+ NavigateDirection.NavigateDirection_FirstChild => GetChild(0),
+ NavigateDirection.NavigateDirection_LastChild => GetLastChild(),
_ => base.FragmentNavigate(direction)
};
}
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ListView.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ListView.cs
index f45752b4203..837c6da6aee 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ListView.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ListView.cs
@@ -4847,8 +4847,8 @@ protected virtual void OnItemChecked(ItemCheckedEventArgs e)
if (IsAccessibilityObjectCreated)
{
ListViewItem item = e.Item;
- UiaCore.ToggleState oldValue = item.Checked ? UiaCore.ToggleState.Off : UiaCore.ToggleState.On;
- UiaCore.ToggleState newValue = item.Checked ? UiaCore.ToggleState.On : UiaCore.ToggleState.Off;
+ ToggleState oldValue = item.Checked ? ToggleState.ToggleState_Off : ToggleState.ToggleState_On;
+ ToggleState newValue = item.Checked ? ToggleState.ToggleState_On : ToggleState.ToggleState_Off;
item.AccessibilityObject.RaiseAutomationPropertyChangedEvent(UIA_PROPERTY_ID.UIA_ToggleToggleStatePropertyId, oldValue, newValue);
}
}
@@ -6048,7 +6048,7 @@ private unsafe bool WmNotify(ref Message m)
{
NMHDR* nmhdr = (NMHDR*)(nint)m.LParamInternal;
- if (nmhdr->code == PInvoke.NM_CUSTOMDRAW && UiaCore.UiaClientsAreListening())
+ if (nmhdr->code == PInvoke.NM_CUSTOMDRAW && PInvoke.UiaClientsAreListening())
{
// Checking that mouse buttons are not pressed is necessary to avoid
// multiple annotation of the column header when resizing the column with the mouse
@@ -6780,20 +6780,20 @@ private unsafe void WmReflectNotify(ref Message m)
{
AccessibleObject accessibleObject = SelectedItems[0].AccessibilityObject;
if (lvkd->wVKey == (short)Keys.Down
- && accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.NextSibling) is null)
+ && accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling) is null)
{
- ListViewGroupAccessibleObject? groupAccObj = (ListViewGroupAccessibleObject?)accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent);
+ ListViewGroupAccessibleObject? groupAccObj = (ListViewGroupAccessibleObject?)accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent);
if (groupAccObj is not null)
{
- ListViewGroupAccessibleObject? nextGroupAccObj = (ListViewGroupAccessibleObject?)groupAccObj.FragmentNavigate(UiaCore.NavigateDirection.NextSibling);
+ ListViewGroupAccessibleObject? nextGroupAccObj = (ListViewGroupAccessibleObject?)groupAccObj.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling);
nextGroupAccObj?.SetFocus();
}
}
if (lvkd->wVKey == (short)Keys.Up
- && accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling) is null)
+ && accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling) is null)
{
- ListViewGroupAccessibleObject? groupAccObj = (ListViewGroupAccessibleObject?)accessibleObject.FragmentNavigate(UiaCore.NavigateDirection.Parent);
+ ListViewGroupAccessibleObject? groupAccObj = (ListViewGroupAccessibleObject?)accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent);
groupAccObj?.SetFocus();
}
}
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ListViewGroup.ListViewGroupAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ListViewGroup.ListViewGroupAccessibleObject.cs
index 38d309bcf30..ec6a0963721 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ListViewGroup.ListViewGroupAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ListViewGroup.ListViewGroupAccessibleObject.cs
@@ -88,10 +88,10 @@ internal int CurrentIndex
public override string DefaultAction
=> SR.AccessibleActionDoubleClick;
- internal override UiaCore.ExpandCollapseState ExpandCollapseState
+ internal override ExpandCollapseState ExpandCollapseState
=> _owningGroup.CollapsedState == ListViewGroupCollapsedState.Collapsed
- ? UiaCore.ExpandCollapseState.Collapsed
- : UiaCore.ExpandCollapseState.Expanded;
+ ? ExpandCollapseState.ExpandCollapseState_Collapsed
+ : ExpandCollapseState.ExpandCollapseState_Expanded;
internal override UiaCore.IRawElementProviderFragmentRoot FragmentRoot
=> _owningListView.AccessibilityObject;
@@ -218,7 +218,7 @@ internal IReadOnlyList GetVisibleItems()
return visibleItems;
}
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
{
if (!_owningListView.IsHandleCreated || !_owningListView.GroupsDisplayed || IsEmpty)
{
@@ -227,18 +227,18 @@ internal IReadOnlyList GetVisibleItems()
switch (direction)
{
- case UiaCore.NavigateDirection.Parent:
+ case NavigateDirection.NavigateDirection_Parent:
return _owningListViewAccessibilityObject;
- case UiaCore.NavigateDirection.NextSibling:
+ case NavigateDirection.NavigateDirection_NextSibling:
int childIndex = _owningListViewAccessibilityObject.GetChildIndex(this);
return childIndex == InvalidIndex
? null
: _owningListViewAccessibilityObject.GetChild(childIndex + 1);
- case UiaCore.NavigateDirection.PreviousSibling:
+ case NavigateDirection.NavigateDirection_PreviousSibling:
return _owningListViewAccessibilityObject.GetChild(_owningListViewAccessibilityObject.GetChildIndex(this) - 1);
- case UiaCore.NavigateDirection.FirstChild:
+ case NavigateDirection.NavigateDirection_FirstChild:
return GetChild(0);
- case UiaCore.NavigateDirection.LastChild:
+ case NavigateDirection.NavigateDirection_LastChild:
IReadOnlyList visibleItems = GetVisibleItems();
return visibleItems.Count > 0 ? visibleItems[visibleItems.Count - 1].AccessibilityObject : null;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.ListViewItemBaseAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.ListViewItemBaseAccessibleObject.cs
index 2d081ff2f2f..fbc69b01c2d 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.ListViewItemBaseAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.ListViewItemBaseAccessibleObject.cs
@@ -124,21 +124,21 @@ public override void DoDefaultAction()
SetFocus();
}
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
{
AccessibleObject _parentInternal = OwningGroup?.AccessibilityObject ?? _owningListView.AccessibilityObject;
switch (direction)
{
- case UiaCore.NavigateDirection.Parent:
+ case NavigateDirection.NavigateDirection_Parent:
return _parentInternal;
- case UiaCore.NavigateDirection.NextSibling:
+ case NavigateDirection.NavigateDirection_NextSibling:
int childIndex = _parentInternal.GetChildIndex(this);
return childIndex == InvalidIndex ? null : _parentInternal.GetChild(childIndex + 1);
- case UiaCore.NavigateDirection.PreviousSibling:
+ case NavigateDirection.NavigateDirection_PreviousSibling:
return _parentInternal.GetChild(_parentInternal.GetChildIndex(this) - 1);
- case UiaCore.NavigateDirection.FirstChild:
- case UiaCore.NavigateDirection.LastChild:
+ case NavigateDirection.NavigateDirection_FirstChild:
+ case NavigateDirection.NavigateDirection_LastChild:
return null;
}
@@ -209,10 +209,10 @@ internal override int[] RuntimeId
}
}
- internal override UiaCore.ToggleState ToggleState
+ internal override ToggleState ToggleState
=> _owningItem.Checked
- ? UiaCore.ToggleState.On
- : UiaCore.ToggleState.Off;
+ ? ToggleState.ToggleState_On
+ : ToggleState.ToggleState_Off;
///
/// Indicates whether specified pattern is supported.
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.ListViewItemDetailsAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.ListViewItemDetailsAccessibleObject.cs
index d67b23e68c7..2160ebbd6c5 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.ListViewItemDetailsAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.ListViewItemDetailsAccessibleObject.cs
@@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
using System.Drawing;
+using Windows.Win32.UI.Accessibility;
using static Interop;
namespace System.Windows.Forms;
@@ -33,13 +34,13 @@ private int AccessibleChildToSubItemIndex(int accessibleChildIndex) => HasImage
? _owningListView.Columns[accessibleChildIndex - 1]._correspondingListViewSubItemIndex
: _owningListView.Columns[accessibleChildIndex]._correspondingListViewSubItemIndex;
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
{
switch (direction)
{
- case UiaCore.NavigateDirection.FirstChild:
+ case NavigateDirection.NavigateDirection_FirstChild:
return GetChild(0);
- case UiaCore.NavigateDirection.LastChild:
+ case NavigateDirection.NavigateDirection_LastChild:
return GetChild(LastChildIndex);
}
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.ListViewItemImageAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.ListViewItemImageAccessibleObject.cs
index 648138167bd..687053eef8f 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.ListViewItemImageAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.ListViewItemImageAccessibleObject.cs
@@ -66,12 +66,12 @@ internal override int[] RuntimeId
_ => base.GetPropertyValue(propertyID)
};
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
=> direction switch
{
- UiaCore.NavigateDirection.Parent => Parent,
- UiaCore.NavigateDirection.NextSibling => Parent.GetChild(1),
- UiaCore.NavigateDirection.PreviousSibling => null,
+ NavigateDirection.NavigateDirection_Parent => Parent,
+ NavigateDirection.NavigateDirection_NextSibling => Parent.GetChild(1),
+ NavigateDirection.NavigateDirection_PreviousSibling => null,
_ => base.FragmentNavigate(direction)
};
}
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.ListViewItemListAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.ListViewItemListAccessibleObject.cs
index c8685e32b83..fd7c6d5c75b 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.ListViewItemListAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.ListViewItemListAccessibleObject.cs
@@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
using System.Drawing;
+using Windows.Win32.UI.Accessibility;
using static Interop;
namespace System.Windows.Forms;
@@ -25,18 +26,18 @@ public override Rectangle Bounds
protected override View View => View.List;
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
{
AccessibleObject _parentInternal = _owningListView.AccessibilityObject;
switch (direction)
{
- case UiaCore.NavigateDirection.Parent:
+ case NavigateDirection.NavigateDirection_Parent:
return _parentInternal;
- case UiaCore.NavigateDirection.NextSibling:
+ case NavigateDirection.NavigateDirection_NextSibling:
int childIndex = _parentInternal.GetChildIndex(this);
return childIndex == InvalidIndex ? null : _parentInternal.GetChild(childIndex + 1);
- case UiaCore.NavigateDirection.PreviousSibling:
+ case NavigateDirection.NavigateDirection_PreviousSibling:
return _parentInternal.GetChild(_parentInternal.GetChildIndex(this) - 1);
}
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.ListViewItemTileAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.ListViewItemTileAccessibleObject.cs
index 4c16631f737..8d943425570 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.ListViewItemTileAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.ListViewItemTileAccessibleObject.cs
@@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
using System.Drawing;
+using Windows.Win32.UI.Accessibility;
using static Interop;
namespace System.Windows.Forms;
@@ -22,15 +23,15 @@ private ListViewLabelEditAccessibleObject? LabelEditAccessibleObject
? null
: new(_owningListView, _owningListView._labelEdit);
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
{
switch (direction)
{
- case UiaCore.NavigateDirection.FirstChild:
+ case NavigateDirection.NavigateDirection_FirstChild:
return _owningListView._labelEdit is not null
? LabelEditAccessibleObject
: GetChildInternal(1);
- case UiaCore.NavigateDirection.LastChild:
+ case NavigateDirection.NavigateDirection_LastChild:
return GetChildInternal(GetLastChildIndex());
}
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.ListViewItemWithImageAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.ListViewItemWithImageAccessibleObject.cs
index a5e2d2a73d6..0d288cfb808 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.ListViewItemWithImageAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.ListViewItemWithImageAccessibleObject.cs
@@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
using System.Drawing;
+using Windows.Win32.UI.Accessibility;
using static Interop;
namespace System.Windows.Forms;
@@ -28,13 +29,13 @@ private ListViewLabelEditAccessibleObject? LabelEditAccessibleObject
? null
: new(_owningListView, _owningListView._labelEdit);
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
{
switch (direction)
{
- case UiaCore.NavigateDirection.FirstChild:
+ case NavigateDirection.NavigateDirection_FirstChild:
return GetChildCount() > 0 ? GetChild(0) : null;
- case UiaCore.NavigateDirection.LastChild:
+ case NavigateDirection.NavigateDirection_LastChild:
return GetChildCount() > 0 ? GetChild(GetChildCount() - 1) : null;
}
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.ListViewSubItem.ListViewSubItemAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.ListViewSubItem.ListViewSubItemAccessibleObject.cs
index 38db4b08571..8a93f4a19cd 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.ListViewSubItem.ListViewSubItemAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ListViewItem.ListViewSubItem.ListViewSubItemAccessibleObject.cs
@@ -68,17 +68,17 @@ public override Rectangle Bounds
}
}
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
=> direction switch
{
- UiaCore.NavigateDirection.Parent
+ NavigateDirection.NavigateDirection_Parent
=> ParentInternal,
- UiaCore.NavigateDirection.NextSibling
+ NavigateDirection.NavigateDirection_NextSibling
=> ParentInternal.GetChildInternal(ParentInternal.GetChildIndex(this) + 1),
- UiaCore.NavigateDirection.PreviousSibling
+ NavigateDirection.NavigateDirection_PreviousSibling
=> ParentInternal.GetChildInternal(ParentInternal.GetChildIndex(this) - 1),
- UiaCore.NavigateDirection.FirstChild => GetChild(),
- UiaCore.NavigateDirection.LastChild => GetChild(),
+ NavigateDirection.NavigateDirection_FirstChild => GetChild(),
+ NavigateDirection.NavigateDirection_LastChild => GetChild(),
_ => base.FragmentNavigate(direction)
};
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ListViewLabelEditAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ListViewLabelEditAccessibleObject.cs
index e31ddde4c7a..60cb7ea1c23 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ListViewLabelEditAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ListViewLabelEditAccessibleObject.cs
@@ -53,10 +53,10 @@ public override AccessibleObject? Parent
_ => base.GetPropertyValue(propertyID)
};
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
=> direction switch
{
- UiaCore.NavigateDirection.NextSibling
+ NavigateDirection.NavigateDirection_NextSibling
=> _owningListView.TryGetTarget(out ListView? target) && target.View == View.Tile ? target._selectedItem?.SubItems[1].AccessibilityObject : null,
_ => base.FragmentNavigate(direction)
};
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarAccessibleObject.cs
index 6bafd36d789..daa856bcb28 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarAccessibleObject.cs
@@ -103,20 +103,20 @@ internal SelectionRange? DateRange
}
}
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
=> direction switch
{
- UiaCore.NavigateDirection.NextSibling
+ NavigateDirection.NavigateDirection_NextSibling
=> _monthCalendarAccessibleObject.CalendarsAccessibleObjects?.Find(this)?.Next?.Value
?? (_monthCalendarAccessibleObject.ShowToday
? (AccessibleObject)_monthCalendarAccessibleObject.TodayLinkAccessibleObject
: null),
- UiaCore.NavigateDirection.PreviousSibling
+ NavigateDirection.NavigateDirection_PreviousSibling
=> _calendarIndex == 0
? _monthCalendarAccessibleObject.NextButtonAccessibleObject
: _monthCalendarAccessibleObject.CalendarsAccessibleObjects?.Find(this)?.Previous?.Value,
- UiaCore.NavigateDirection.FirstChild => CalendarHeaderAccessibleObject,
- UiaCore.NavigateDirection.LastChild => CalendarBodyAccessibleObject,
+ NavigateDirection.NavigateDirection_FirstChild => CalendarHeaderAccessibleObject,
+ NavigateDirection.NavigateDirection_LastChild => CalendarBodyAccessibleObject,
_ => base.FragmentNavigate(direction),
};
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarBodyAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarBodyAccessibleObject.cs
index 4d43b55d955..aa00c3471d8 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarBodyAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarBodyAccessibleObject.cs
@@ -72,13 +72,13 @@ internal void DisconnectChildren()
///
internal override int ColumnCount => _monthCalendarAccessibleObject.CalendarView == MONTH_CALDENDAR_MESSAGES_VIEW.MCMV_MONTH ? 7 : 4;
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
=> direction switch
{
- UiaCore.NavigateDirection.NextSibling => null,
- UiaCore.NavigateDirection.PreviousSibling => _calendarAccessibleObject.CalendarHeaderAccessibleObject,
- UiaCore.NavigateDirection.FirstChild => RowsAccessibleObjects?.First?.Value,
- UiaCore.NavigateDirection.LastChild => RowsAccessibleObjects?.Last?.Value,
+ NavigateDirection.NavigateDirection_NextSibling => null,
+ NavigateDirection.NavigateDirection_PreviousSibling => _calendarAccessibleObject.CalendarHeaderAccessibleObject,
+ NavigateDirection.NavigateDirection_FirstChild => RowsAccessibleObjects?.First?.Value,
+ NavigateDirection.NavigateDirection_LastChild => RowsAccessibleObjects?.Last?.Value,
_ => base.FragmentNavigate(direction),
};
@@ -203,7 +203,7 @@ internal override bool IsPatternSupported(UIA_PATTERN_ID patternId)
internal override int RowCount => RowsAccessibleObjects?.Count ?? -1;
- internal override UiaCore.RowOrColumnMajor RowOrColumnMajor => UiaCore.RowOrColumnMajor.RowMajor;
+ internal override RowOrColumnMajor RowOrColumnMajor => RowOrColumnMajor.RowOrColumnMajor_RowMajor;
// Use a LinkedList instead a List for the following reasons:
// 1. We don't require an access to items by indices.
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarCellAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarCellAccessibleObject.cs
index f67f842c0c2..7b12c6e7dfd 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarCellAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarCellAccessibleObject.cs
@@ -93,12 +93,12 @@ public override string? Description
}
}
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
=> direction switch
{
- UiaCore.NavigateDirection.NextSibling
+ NavigateDirection.NavigateDirection_NextSibling
=> _calendarRowAccessibleObject.CellsAccessibleObjects?.Find(this)?.Next?.Value,
- UiaCore.NavigateDirection.PreviousSibling
+ NavigateDirection.NavigateDirection_PreviousSibling
=> _columnIndex == 0
? _calendarRowAccessibleObject.WeekNumberCellAccessibleObject
: _calendarRowAccessibleObject.CellsAccessibleObjects?.Find(this)?.Previous?.Value,
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarDayOfWeekCellAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarDayOfWeekCellAccessibleObject.cs
index d2a57955790..8d93eeef764 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarDayOfWeekCellAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarDayOfWeekCellAccessibleObject.cs
@@ -36,11 +36,11 @@ public CalendarDayOfWeekCellAccessibleObject(CalendarRowAccessibleObject calenda
public override string? Description => null;
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction) =>
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction) =>
direction switch
{
- UiaCore.NavigateDirection.NextSibling => _calendarRowAccessibleObject.CellsAccessibleObjects?.Find(this)?.Next?.Value,
- UiaCore.NavigateDirection.PreviousSibling => _calendarRowAccessibleObject.CellsAccessibleObjects?.Find(this)?.Previous?.Value,
+ NavigateDirection.NavigateDirection_NextSibling => _calendarRowAccessibleObject.CellsAccessibleObjects?.Find(this)?.Next?.Value,
+ NavigateDirection.NavigateDirection_PreviousSibling => _calendarRowAccessibleObject.CellsAccessibleObjects?.Find(this)?.Previous?.Value,
_ => base.FragmentNavigate(direction)
};
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarHeaderAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarHeaderAccessibleObject.cs
index 6ba632fbcdc..a7f2ef6efb2 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarHeaderAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarHeaderAccessibleObject.cs
@@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
using System.Drawing;
+using Windows.Win32.UI.Accessibility;
using static Interop;
namespace System.Windows.Forms;
@@ -47,11 +48,11 @@ public CalendarHeaderAccessibleObject(CalendarAccessibleObject calendarAccessibl
public override Rectangle Bounds
=> _monthCalendarAccessibleObject.GetCalendarPartRectangle(MCGRIDINFO_PART.MCGIP_CALENDARHEADER, _calendarIndex);
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
=> direction switch
{
- UiaCore.NavigateDirection.PreviousSibling => null,
- UiaCore.NavigateDirection.NextSibling => _calendarAccessibleObject.CalendarBodyAccessibleObject,
+ NavigateDirection.NavigateDirection_PreviousSibling => null,
+ NavigateDirection.NavigateDirection_NextSibling => _calendarAccessibleObject.CalendarBodyAccessibleObject,
_ => base.FragmentNavigate(direction)
};
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarNextButtonAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarNextButtonAccessibleObject.cs
index 2c9aa9ed099..c37644db309 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarNextButtonAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarNextButtonAccessibleObject.cs
@@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
using System.Drawing;
+using Windows.Win32.UI.Accessibility;
using static Interop;
namespace System.Windows.Forms;
@@ -30,11 +31,11 @@ public override Rectangle Bounds
public override string Description => SR.CalendarNextButtonAccessibleObjectDescription;
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
=> direction switch
{
- UiaCore.NavigateDirection.PreviousSibling => _monthCalendarAccessibleObject.PreviousButtonAccessibleObject,
- UiaCore.NavigateDirection.NextSibling => _monthCalendarAccessibleObject.CalendarsAccessibleObjects?.First?.Value,
+ NavigateDirection.NavigateDirection_PreviousSibling => _monthCalendarAccessibleObject.PreviousButtonAccessibleObject,
+ NavigateDirection.NavigateDirection_NextSibling => _monthCalendarAccessibleObject.CalendarsAccessibleObjects?.First?.Value,
_ => base.FragmentNavigate(direction)
};
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarPreviousButtonAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarPreviousButtonAccessibleObject.cs
index e5a3c7554e5..35b94a6db16 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarPreviousButtonAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarPreviousButtonAccessibleObject.cs
@@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
using System.Drawing;
+using Windows.Win32.UI.Accessibility;
using static Interop;
namespace System.Windows.Forms;
@@ -62,10 +63,10 @@ private protected override bool IsEnabled
}
}
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
=> direction switch
{
- UiaCore.NavigateDirection.NextSibling => _monthCalendarAccessibleObject.NextButtonAccessibleObject,
+ NavigateDirection.NavigateDirection_NextSibling => _monthCalendarAccessibleObject.NextButtonAccessibleObject,
_ => base.FragmentNavigate(direction)
};
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarRowAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarRowAccessibleObject.cs
index 5e361e062ac..1c11ea022bb 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarRowAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarRowAccessibleObject.cs
@@ -142,18 +142,18 @@ public override string? Description
}
}
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
=> direction switch
{
- UiaCore.NavigateDirection.NextSibling
+ NavigateDirection.NavigateDirection_NextSibling
=> _calendarBodyAccessibleObject.RowsAccessibleObjects?.Find(this)?.Next?.Value,
- UiaCore.NavigateDirection.PreviousSibling
+ NavigateDirection.NavigateDirection_PreviousSibling
=> _calendarBodyAccessibleObject.RowsAccessibleObjects?.Find(this)?.Previous?.Value,
- UiaCore.NavigateDirection.FirstChild
+ NavigateDirection.NavigateDirection_FirstChild
=> _monthCalendarAccessibleObject.ShowWeekNumbers && _rowIndex != -1
? WeekNumberCellAccessibleObject
: CellsAccessibleObjects?.First?.Value,
- UiaCore.NavigateDirection.LastChild => CellsAccessibleObjects?.Last?.Value,
+ NavigateDirection.NavigateDirection_LastChild => CellsAccessibleObjects?.Last?.Value,
_ => base.FragmentNavigate(direction)
};
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarTodayLinkAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarTodayLinkAccessibleObject.cs
index ccd3f4a5f86..e1122191351 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarTodayLinkAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarTodayLinkAccessibleObject.cs
@@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
using System.Drawing;
+using Windows.Win32.UI.Accessibility;
using static Interop;
namespace System.Windows.Forms;
@@ -31,10 +32,10 @@ public override Rectangle Bounds
public override string Description => SR.CalendarTodayLinkAccessibleObjectDescription;
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
=> direction switch
{
- UiaCore.NavigateDirection.PreviousSibling
+ NavigateDirection.NavigateDirection_PreviousSibling
=> _monthCalendarAccessibleObject.CalendarsAccessibleObjects?.Last?.Value,
_ => base.FragmentNavigate(direction)
};
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarWeekNumberCellAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarWeekNumberCellAccessibleObject.cs
index df9d7eeff42..4a109fb1387 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarWeekNumberCellAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.CalendarWeekNumberCellAccessibleObject.cs
@@ -41,11 +41,11 @@ public CalendarWeekNumberCellAccessibleObject(CalendarRowAccessibleObject calend
public override string? Description => null;
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
=> direction switch
{
- UiaCore.NavigateDirection.NextSibling => _calendarRowAccessibleObject.CellsAccessibleObjects?.First?.Value,
- UiaCore.NavigateDirection.PreviousSibling => null,
+ NavigateDirection.NavigateDirection_NextSibling => _calendarRowAccessibleObject.CellsAccessibleObjects?.First?.Value,
+ NavigateDirection.NavigateDirection_PreviousSibling => null,
_ => base.FragmentNavigate(direction)
};
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.MonthCalendarAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.MonthCalendarAccessibleObject.cs
index 8fd76937e62..1846139f5a7 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.MonthCalendarAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.MonthCalendarAccessibleObject.cs
@@ -204,11 +204,11 @@ or MCHITTESTINFO_HIT_FLAGS.MCHT_CALENDARDATEPREV or MCHITTESTINFO_HIT_FLAGS.MCHT
internal CalendarCellAccessibleObject? FocusedCell
=> _focusedCellAccessibleObject ??= this.TryGetOwnerAs(out MonthCalendar? owner) ? GetCellByDate(owner._focusedDate) : null;
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
=> direction switch
{
- UiaCore.NavigateDirection.FirstChild => PreviousButtonAccessibleObject,
- UiaCore.NavigateDirection.LastChild => ShowToday
+ NavigateDirection.NavigateDirection_FirstChild => PreviousButtonAccessibleObject,
+ NavigateDirection.NavigateDirection_LastChild => ShowToday
? TodayLinkAccessibleObject
: CalendarsAccessibleObjects?.Last?.Value,
_ => base.FragmentNavigate(direction),
@@ -533,7 +533,7 @@ internal override int RowCount
? (int)Math.Ceiling((double)CalendarsAccessibleObjects.Count / ColumnCount)
: 0;
- internal override UiaCore.RowOrColumnMajor RowOrColumnMajor => UiaCore.RowOrColumnMajor.RowMajor;
+ internal override RowOrColumnMajor RowOrColumnMajor => RowOrColumnMajor.RowOrColumnMajor_RowMajor;
internal SelectionRange SelectionRange => this.TryGetOwnerAs(out MonthCalendar? owner) ? owner.SelectionRange : new SelectionRange();
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.MonthCalendarChildAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.MonthCalendarChildAccessibleObject.cs
index 6cb727695c9..c022912d970 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.MonthCalendarChildAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/MonthCalendar.MonthCalendarChildAccessibleObject.cs
@@ -42,10 +42,10 @@ internal override bool IsPatternSupported(UIA_PATTERN_ID patternId)
internal override UiaCore.IRawElementProviderFragmentRoot FragmentRoot => _monthCalendarAccessibleObject;
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
=> direction switch
{
- UiaCore.NavigateDirection.Parent => Parent,
+ NavigateDirection.NavigateDirection_Parent => Parent,
_ => base.FragmentNavigate(direction)
};
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Printing/PrintPreviewControl.PrintPreviewControlAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Printing/PrintPreviewControl.PrintPreviewControlAccessibleObject.cs
index 64806a52004..00b42ed067c 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Printing/PrintPreviewControl.PrintPreviewControlAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Printing/PrintPreviewControl.PrintPreviewControlAccessibleObject.cs
@@ -66,7 +66,7 @@ internal override bool IsPatternSupported(UIA_PATTERN_ID patternId)
internal override UiaCore.IRawElementProviderFragmentRoot FragmentRoot
=> this;
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
{
if (!this.TryGetOwnerAs(out PrintPreviewControl? owner))
{
@@ -75,12 +75,12 @@ internal override UiaCore.IRawElementProviderFragmentRoot FragmentRoot
switch (direction)
{
- case UiaCore.NavigateDirection.FirstChild:
+ case NavigateDirection.NavigateDirection_FirstChild:
return owner._vScrollBar.Visible ? owner._vScrollBar.AccessibilityObject
: owner._hScrollBar.Visible ? owner._hScrollBar.AccessibilityObject
: null;
- case UiaCore.NavigateDirection.LastChild:
+ case NavigateDirection.NavigateDirection_LastChild:
return owner._hScrollBar.Visible ? owner._hScrollBar.AccessibilityObject
: owner._vScrollBar.Visible ? owner._vScrollBar.AccessibilityObject
: null;
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Printing/PrintPreviewControl.ScrollBarAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Printing/PrintPreviewControl.ScrollBarAccessibleObject.cs
index ffa53b78e17..4f05eafa35e 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Printing/PrintPreviewControl.ScrollBarAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Printing/PrintPreviewControl.ScrollBarAccessibleObject.cs
@@ -1,6 +1,7 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
+using Windows.Win32.UI.Accessibility;
using static Interop;
namespace System.Windows.Forms;
@@ -17,7 +18,7 @@ public override AccessibleObject? Parent
=> this.TryGetOwnerAs(out ScrollBar? scrollBar) && scrollBar.Parent is PrintPreviewControl printPreviewControl
? printPreviewControl.AccessibilityObject : base.Parent;
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
{
if (!this.TryGetOwnerAs(out ScrollBar? scrollBar) || scrollBar.Parent is not PrintPreviewControl printPreviewControl)
{
@@ -26,16 +27,16 @@ public override AccessibleObject? Parent
switch (direction)
{
- case UiaCore.NavigateDirection.Parent:
+ case NavigateDirection.NavigateDirection_Parent:
return printPreviewControl.AccessibilityObject;
- case UiaCore.NavigateDirection.NextSibling:
+ case NavigateDirection.NavigateDirection_NextSibling:
return printPreviewControl._vScrollBar.Visible &&
printPreviewControl._hScrollBar.Visible &&
scrollBar == printPreviewControl._vScrollBar
? printPreviewControl._hScrollBar.AccessibilityObject : null;
- case UiaCore.NavigateDirection.PreviousSibling:
+ case NavigateDirection.NavigateDirection_PreviousSibling:
return printPreviewControl._hScrollBar.Visible &&
printPreviewControl._vScrollBar.Visible &&
scrollBar == printPreviewControl._hScrollBar
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Printing/PrintPreviewControl.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Printing/PrintPreviewControl.cs
index b48a0166526..21f8865d2a6 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/Printing/PrintPreviewControl.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/Printing/PrintPreviewControl.cs
@@ -5,6 +5,7 @@
using System.Drawing;
using System.Drawing.Printing;
using System.Runtime.InteropServices;
+using Windows.Win32.UI.Accessibility;
namespace System.Windows.Forms;
@@ -893,7 +894,7 @@ private void LayoutScrollBars()
IsAccessibilityObjectCreated &&
AccessibilityObject is PrintPreviewControlAccessibleObject ao)
{
- ao.RaiseStructureChangedEvent(Interop.UiaCore.StructureChangeType.ChildrenInvalidated, Array.Empty());
+ ao.RaiseStructureChangedEvent(StructureChangeType.StructureChangeType_ChildrenInvalidated, Array.Empty());
}
(bool horizontal, bool vertical) IsScrollNeeded(Size displaySize)
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGrid.PropertyGridAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGrid.PropertyGridAccessibleObject.cs
index ad3dbf2407c..da026c674e9 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGrid.PropertyGridAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGrid.PropertyGridAccessibleObject.cs
@@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
using System.Drawing;
+using Windows.Win32.UI.Accessibility;
using static Interop;
namespace System.Windows.Forms;
@@ -54,13 +55,13 @@ public PropertyGridAccessibleObject(PropertyGrid owningPropertyGrid) : base(owni
///
/// Indicates the direction in which to navigate.
/// Returns the element in the specified direction.
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
{
switch (direction)
{
- case UiaCore.NavigateDirection.FirstChild:
+ case NavigateDirection.NavigateDirection_FirstChild:
return GetChildFragment(0);
- case UiaCore.NavigateDirection.LastChild:
+ case NavigateDirection.NavigateDirection_LastChild:
var childFragmentCount = GetChildFragmentCount();
if (childFragmentCount > 0)
{
@@ -79,13 +80,13 @@ public PropertyGridAccessibleObject(PropertyGrid owningPropertyGrid) : base(owni
/// The child element regarding which the target element is searched.
/// Indicates the direction in which to navigate.
/// Returns the element in the specified direction.
- internal UiaCore.IRawElementProviderFragment? ChildFragmentNavigate(AccessibleObject childFragment, UiaCore.NavigateDirection direction)
+ internal UiaCore.IRawElementProviderFragment? ChildFragmentNavigate(AccessibleObject childFragment, NavigateDirection direction)
{
switch (direction)
{
- case UiaCore.NavigateDirection.Parent:
+ case NavigateDirection.NavigateDirection_Parent:
return this;
- case UiaCore.NavigateDirection.NextSibling:
+ case NavigateDirection.NavigateDirection_NextSibling:
int fragmentCount = GetChildFragmentCount();
int childFragmentIndex = GetChildFragmentIndex(childFragment);
int nextChildFragmentIndex = childFragmentIndex + 1;
@@ -95,7 +96,7 @@ public PropertyGridAccessibleObject(PropertyGrid owningPropertyGrid) : base(owni
}
return null;
- case UiaCore.NavigateDirection.PreviousSibling:
+ case NavigateDirection.NavigateDirection_PreviousSibling:
fragmentCount = GetChildFragmentCount();
childFragmentIndex = GetChildFragmentIndex(childFragment);
if (childFragmentIndex > 0)
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/CategoryGridEntry.CategoryGridEntryAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/CategoryGridEntry.CategoryGridEntryAccessibleObject.cs
index 73b338e93da..9e5393054f9 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/CategoryGridEntry.CategoryGridEntryAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/CategoryGridEntry.CategoryGridEntryAccessibleObject.cs
@@ -72,7 +72,7 @@ internal override int Row
///
/// Indicates the direction in which to navigate.
/// Returns the element in the specified direction.
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
{
if (Parent is not PropertyGridView.PropertyGridViewAccessibleObject parent
|| !this.TryGetOwnerAs(out CategoryGridEntry? owner))
@@ -82,11 +82,11 @@ internal override int Row
return direction switch
{
- UiaCore.NavigateDirection.Parent => Parent,
- UiaCore.NavigateDirection.NextSibling => parent.GetNextCategory(owner),
- UiaCore.NavigateDirection.PreviousSibling => parent.GetPreviousCategory(owner),
- UiaCore.NavigateDirection.FirstChild => parent.GetFirstChildProperty(owner),
- UiaCore.NavigateDirection.LastChild => parent.GetLastChildProperty(owner),
+ NavigateDirection.NavigateDirection_Parent => Parent,
+ NavigateDirection.NavigateDirection_NextSibling => parent.GetNextCategory(owner),
+ NavigateDirection.NavigateDirection_PreviousSibling => parent.GetPreviousCategory(owner),
+ NavigateDirection.NavigateDirection_FirstChild => parent.GetFirstChildProperty(owner),
+ NavigateDirection.NavigateDirection_LastChild => parent.GetLastChildProperty(owner),
_ => base.FragmentNavigate(direction),
};
}
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/CommandsPane.CommandsPaneAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/CommandsPane.CommandsPaneAccessibleObject.cs
index 407a2e3b5d6..73076391f02 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/CommandsPane.CommandsPaneAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/CommandsPane.CommandsPaneAccessibleObject.cs
@@ -25,7 +25,7 @@ public CommandsPaneAccessibleObject(CommandsPane owningCommandsPane, PropertyGri
_parentPropertyGrid = new(parentPropertyGrid);
}
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
{
if (_parentPropertyGrid.TryGetTarget(out PropertyGrid? target)
&& target.AccessibilityObject is PropertyGrid.PropertyGridAccessibleObject propertyGridAccessibleObject)
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/DetailsButton.DetailsButtonAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/DetailsButton.DetailsButtonAccessibleObject.cs
index 396df8c2bb6..f58a098588a 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/DetailsButton.DetailsButtonAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/DetailsButton.DetailsButtonAccessibleObject.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
using Windows.Win32.UI.Accessibility;
-using static Interop;
namespace System.Windows.Forms.PropertyGridInternal;
@@ -31,10 +30,10 @@ internal override bool IsIAccessibleExSupported()
internal override bool IsPatternSupported(UIA_PATTERN_ID patternId)
=> patternId == UIA_PATTERN_ID.UIA_ExpandCollapsePatternId || base.IsPatternSupported(patternId);
- internal override UiaCore.ExpandCollapseState ExpandCollapseState
+ internal override ExpandCollapseState ExpandCollapseState
=> _ownerItem.Expanded
- ? UiaCore.ExpandCollapseState.Expanded
- : UiaCore.ExpandCollapseState.Collapsed;
+ ? ExpandCollapseState.ExpandCollapseState_Expanded
+ : ExpandCollapseState.ExpandCollapseState_Collapsed;
internal override void Expand()
{
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/DropDownButton.DropDownButtonAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/DropDownButton.DropDownButtonAccessibleObject.cs
index 1722c5e9e54..90c539a8e50 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/DropDownButton.DropDownButtonAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/DropDownButton.DropDownButtonAccessibleObject.cs
@@ -46,7 +46,7 @@ public override void DoDefaultAction()
///
/// Indicates the direction in which to navigate.
/// Returns the element in the specified direction.
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
{
if (!_owningDropDownButton.Visible
|| _owningPropertyGrid?.SelectedGridEntry?.AccessibilityObject is not PropertyDescriptorGridEntryAccessibleObject parent)
@@ -56,9 +56,9 @@ public override void DoDefaultAction()
return direction switch
{
- UiaCore.NavigateDirection.Parent => parent,
- UiaCore.NavigateDirection.NextSibling => parent.GetNextChild(this),
- UiaCore.NavigateDirection.PreviousSibling => parent.GetPreviousChild(this),
+ NavigateDirection.NavigateDirection_Parent => parent,
+ NavigateDirection.NavigateDirection_NextSibling => parent.GetNextChild(this),
+ NavigateDirection.NavigateDirection_PreviousSibling => parent.GetPreviousChild(this),
_ => base.FragmentNavigate(direction),
};
}
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/GridEntry.GridEntryAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/GridEntry.GridEntryAccessibleObject.cs
index 286207783bb..e0311141541 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/GridEntry.GridEntryAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/GridEntry.GridEntryAccessibleObject.cs
@@ -52,10 +52,10 @@ public override string? DefaultAction
public override string Description
=> this.TryGetOwnerAs(out GridEntry? owner) ? owner.PropertyDescription : string.Empty;
- internal override UiaCore.ExpandCollapseState ExpandCollapseState
- => !this.TryGetOwnerAs(out GridEntry? owner) ? UiaCore.ExpandCollapseState.Collapsed : owner.Expandable
- ? owner.Expanded ? UiaCore.ExpandCollapseState.Expanded : UiaCore.ExpandCollapseState.Collapsed
- : UiaCore.ExpandCollapseState.LeafNode;
+ internal override ExpandCollapseState ExpandCollapseState
+ => !this.TryGetOwnerAs(out GridEntry? owner) ? ExpandCollapseState.ExpandCollapseState_Collapsed : owner.Expandable
+ ? owner.Expanded ? ExpandCollapseState.ExpandCollapseState_Expanded : ExpandCollapseState.ExpandCollapseState_Collapsed
+ : ExpandCollapseState.ExpandCollapseState_LeafNode;
public override string Help => this.TryGetOwnerAs(out GridEntry? owner) ? owner.PropertyDescription : string.Empty;
@@ -311,11 +311,11 @@ internal override void Expand()
///
/// Indicates the direction in which to navigate.
/// Returns the element in the specified direction.
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
{
switch (direction)
{
- case UiaCore.NavigateDirection.Parent:
+ case NavigateDirection.NavigateDirection_Parent:
if (this.TryGetOwnerAs(out GridEntry? owner) && owner.ParentGridEntry is { } parentGridEntry)
{
return parentGridEntry is SingleSelectRootGridEntry
@@ -324,9 +324,9 @@ internal override void Expand()
}
return Parent;
- case UiaCore.NavigateDirection.PreviousSibling:
+ case NavigateDirection.NavigateDirection_PreviousSibling:
return Navigate(AccessibleNavigation.Previous);
- case UiaCore.NavigateDirection.NextSibling:
+ case NavigateDirection.NavigateDirection_NextSibling:
return Navigate(AccessibleNavigation.Next);
}
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/HelpPane.HelpPaneAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/HelpPane.HelpPaneAccessibleObject.cs
index 1d1ef1a8958..8c006092223 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/HelpPane.HelpPaneAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/HelpPane.HelpPaneAccessibleObject.cs
@@ -25,7 +25,7 @@ public HelpPaneAccessibleObject(HelpPane owningHelpPane, PropertyGrid parentProp
_parentPropertyGrid = new(parentPropertyGrid);
}
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
{
if (_parentPropertyGrid.TryGetTarget(out PropertyGrid? target)
&& target.AccessibilityObject is PropertyGrid.PropertyGridAccessibleObject propertyGridAccessibleObject)
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyDescriptorGridEntry.PropertyDescriptorGridEntryAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyDescriptorGridEntry.PropertyDescriptorGridEntryAccessibleObject.cs
index 5c48ad9b63a..0532e8056b9 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyDescriptorGridEntry.PropertyDescriptorGridEntryAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyDescriptorGridEntry.PropertyDescriptorGridEntryAccessibleObject.cs
@@ -14,13 +14,13 @@ public PropertyDescriptorGridEntryAccessibleObject(PropertyDescriptorGridEntry o
{
}
- internal override UiaCore.ExpandCollapseState ExpandCollapseState
+ internal override ExpandCollapseState ExpandCollapseState
=> GetPropertyGridView() is { } propertyGridView
&& this.TryGetOwnerAs(out PropertyDescriptorGridEntry? owner)
&& owner == propertyGridView.SelectedGridEntry
&& (owner.InternalExpanded || propertyGridView.DropDownVisible)
- ? UiaCore.ExpandCollapseState.Expanded
- : UiaCore.ExpandCollapseState.Collapsed;
+ ? ExpandCollapseState.ExpandCollapseState_Expanded
+ : ExpandCollapseState.ExpandCollapseState_Collapsed;
public override AccessibleObject? GetChild(int index)
{
@@ -134,7 +134,7 @@ public override int GetChildCount()
internal override void Collapse()
{
- if (ExpandCollapseState == UiaCore.ExpandCollapseState.Expanded)
+ if (ExpandCollapseState == ExpandCollapseState.ExpandCollapseState_Expanded)
{
ExpandOrCollapse();
}
@@ -142,7 +142,7 @@ internal override void Collapse()
internal override void Expand()
{
- if (ExpandCollapseState == UiaCore.ExpandCollapseState.Collapsed)
+ if (ExpandCollapseState == ExpandCollapseState.ExpandCollapseState_Collapsed)
{
ExpandOrCollapse();
}
@@ -153,13 +153,13 @@ internal override void Expand()
///
/// Indicates the direction in which to navigate.
/// Returns the element in the specified direction.
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
=> direction switch
{
- UiaCore.NavigateDirection.NextSibling => GetNextSibling(),
- UiaCore.NavigateDirection.PreviousSibling => GetPreviousSibling(),
- UiaCore.NavigateDirection.FirstChild => GetFirstChild(),
- UiaCore.NavigateDirection.LastChild => GetLastChild(),
+ NavigateDirection.NavigateDirection_NextSibling => GetNextSibling(),
+ NavigateDirection.NavigateDirection_PreviousSibling => GetPreviousSibling(),
+ NavigateDirection.NavigateDirection_FirstChild => GetFirstChild(),
+ NavigateDirection.NavigateDirection_LastChild => GetLastChild(),
_ => base.FragmentNavigate(direction),
};
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyGridView.DropDownHolder.DropDownHolderAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyGridView.DropDownHolder.DropDownHolderAccessibleObject.cs
index 6bdddf17aef..ea5ded50f78 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyGridView.DropDownHolder.DropDownHolderAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyGridView.DropDownHolder.DropDownHolderAccessibleObject.cs
@@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
using static System.Windows.Forms.PropertyGridInternal.PropertyDescriptorGridEntry;
+using Windows.Win32.UI.Accessibility;
using static Interop;
namespace System.Windows.Forms.PropertyGridInternal;
@@ -19,7 +20,7 @@ public DropDownHolderAccessibleObject(DropDownHolder dropDownHolder) : base(drop
_owningDropDownHolder = dropDownHolder;
}
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
{
if (!ExistsInAccessibleTree)
{
@@ -35,10 +36,10 @@ public DropDownHolderAccessibleObject(DropDownHolder dropDownHolder) : base(drop
return direction switch
{
- UiaCore.NavigateDirection.Parent => parent,
- UiaCore.NavigateDirection.NextSibling => parent.GetNextChild(this),
- UiaCore.NavigateDirection.PreviousSibling => parent.GetPreviousChild(this),
- UiaCore.NavigateDirection.FirstChild or UiaCore.NavigateDirection.LastChild
+ NavigateDirection.NavigateDirection_Parent => parent,
+ NavigateDirection.NavigateDirection_NextSibling => parent.GetNextChild(this),
+ NavigateDirection.NavigateDirection_PreviousSibling => parent.GetPreviousChild(this),
+ NavigateDirection.NavigateDirection_FirstChild or NavigateDirection.NavigateDirection_LastChild
when selectedEntry.Enumerable && _owningDropDownHolder.Component == gridView!.DropDownListBox
=> gridView.DropDownListBoxAccessibleObject,
_ => base.FragmentNavigate(direction),
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyGridView.GridViewListBoxAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyGridView.GridViewListBoxAccessibleObject.cs
index 98f5afa535f..5a6873d5f1a 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyGridView.GridViewListBoxAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyGridView.GridViewListBoxAccessibleObject.cs
@@ -1,6 +1,7 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
+using Windows.Win32.UI.Accessibility;
using static Interop;
namespace System.Windows.Forms.PropertyGridInternal;
@@ -24,7 +25,7 @@ public GridViewListBoxAccessibleObject(GridViewListBox owningGridViewListBox) :
}
}
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
{
if (!this.TryGetOwnerAs(out GridViewListBox? owner)
|| !owner.OwningPropertyGridView.DropDownVisible
@@ -39,7 +40,7 @@ public GridViewListBoxAccessibleObject(GridViewListBox owningGridViewListBox) :
return direction switch
{
- UiaCore.NavigateDirection.Parent => owner.OwningPropertyGridView.DropDownControlHolder.AccessibilityObject,
+ NavigateDirection.NavigateDirection_Parent => owner.OwningPropertyGridView.DropDownControlHolder.AccessibilityObject,
_ => base.FragmentNavigate(direction)
};
}
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyGridView.GridViewTextBox.GridViewTextBoxAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyGridView.GridViewTextBox.GridViewTextBoxAccessibleObject.cs
index 1bb3b16db8c..c34cd73e4c3 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyGridView.GridViewTextBox.GridViewTextBoxAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyGridView.GridViewTextBox.GridViewTextBoxAccessibleObject.cs
@@ -37,7 +37,7 @@ public override AccessibleStates State
}
}
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
{
if (!this.TryGetOwnerAs(out GridViewTextBox? owner)
|| !owner.PropertyGridView.IsEditTextBoxCreated
@@ -51,9 +51,9 @@ public override AccessibleStates State
return direction switch
{
- UiaCore.NavigateDirection.Parent => parent,
- UiaCore.NavigateDirection.NextSibling => parent.GetNextChild(this),
- UiaCore.NavigateDirection.PreviousSibling => parent.GetPreviousChild(this),
+ NavigateDirection.NavigateDirection_Parent => parent,
+ NavigateDirection.NavigateDirection_NextSibling => parent.GetNextChild(this),
+ NavigateDirection.NavigateDirection_PreviousSibling => parent.GetPreviousChild(this),
_ => base.FragmentNavigate(direction),
};
}
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyGridView.PropertyGridViewAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyGridView.PropertyGridViewAccessibleObject.cs
index e66b0e68b99..51a22e3a9fa 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyGridView.PropertyGridViewAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyGridView.PropertyGridViewAccessibleObject.cs
@@ -25,7 +25,7 @@ public PropertyGridViewAccessibleObject(PropertyGridView owner, PropertyGrid par
internal override UiaCore.IRawElementProviderFragment? ElementProviderFromPoint(double x, double y)
=> this.IsOwnerHandleCreated(out Control? _) ? HitTest((int)x, (int)y) : null;
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
{
if (!_parentPropertyGrid.TryGetTarget(out PropertyGrid? target))
{
@@ -47,8 +47,8 @@ public PropertyGridViewAccessibleObject(PropertyGridView owner, PropertyGrid par
return direction switch
{
- UiaCore.NavigateDirection.FirstChild => IsSortedByCategories ? GetCategory(0) : GetChild(0),
- UiaCore.NavigateDirection.LastChild => IsSortedByCategories ? GetLastCategory() : GetLastChild(),
+ NavigateDirection.NavigateDirection_FirstChild => IsSortedByCategories ? GetCategory(0) : GetChild(0),
+ NavigateDirection.NavigateDirection_LastChild => IsSortedByCategories ? GetLastCategory() : GetLastChild(),
_ => base.FragmentNavigate(direction)
};
}
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyGridView.cs b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyGridView.cs
index 234c586879a..8bbf7ac5432 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyGridView.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridInternal/PropertyGridView.cs
@@ -813,8 +813,8 @@ private void CloseDropDownInternal(bool resetFocus)
gridEntry.AccessibilityObject.RaiseAutomationEvent(UIA_EVENT_ID.UIA_AutomationFocusChangedEventId);
gridEntry.AccessibilityObject.RaiseAutomationPropertyChangedEvent(
UIA_PROPERTY_ID.UIA_ExpandCollapseExpandCollapseStatePropertyId,
- UiaCore.ExpandCollapseState.Expanded,
- UiaCore.ExpandCollapseState.Collapsed);
+ ExpandCollapseState.ExpandCollapseState_Expanded,
+ ExpandCollapseState.ExpandCollapseState_Collapsed);
}
}
}
@@ -4658,8 +4658,8 @@ internal void SetExpand(GridEntry entry, bool value)
if (_selectedGridEntry is not null && IsAccessibilityObjectCreated)
{
- var oldExpandedState = value ? UiaCore.ExpandCollapseState.Collapsed : UiaCore.ExpandCollapseState.Expanded;
- var newExpandedState = value ? UiaCore.ExpandCollapseState.Expanded : UiaCore.ExpandCollapseState.Collapsed;
+ var oldExpandedState = value ? ExpandCollapseState.ExpandCollapseState_Collapsed : ExpandCollapseState.ExpandCollapseState_Expanded;
+ var newExpandedState = value ? ExpandCollapseState.ExpandCollapseState_Expanded : ExpandCollapseState.ExpandCollapseState_Collapsed;
_selectedGridEntry.AccessibilityObject.RaiseAutomationPropertyChangedEvent(
UIA_PROPERTY_ID.UIA_ExpandCollapseExpandCollapseStatePropertyId,
oldExpandedState,
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridToolStrip.PropertyGridToolStripAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridToolStrip.PropertyGridToolStripAccessibleObject.cs
index ce082edb568..ecf844016e2 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridToolStrip.PropertyGridToolStripAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/PropertyGridToolStrip.PropertyGridToolStripAccessibleObject.cs
@@ -30,7 +30,7 @@ public PropertyGridToolStripAccessibleObject(PropertyGridToolStrip owningPropert
///
/// Indicates the direction in which to navigate.
/// Returns the element in the specified direction.
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
{
if (_parentPropertyGrid.TryGetTarget(out PropertyGrid? target)
&& target.IsHandleCreated
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ScrollBar.ScrollBarAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ScrollBar.ScrollBarAccessibleObject.cs
index 44d8f7902e3..cd2e8f62199 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ScrollBar.ScrollBarAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ScrollBar.ScrollBarAccessibleObject.cs
@@ -124,11 +124,11 @@ public override int GetChildCount()
return element ?? base.ElementProviderFromPoint(x, y);
}
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
=> direction switch
{
- UiaCore.NavigateDirection.FirstChild => FirstLineButtonAccessibleObject,
- UiaCore.NavigateDirection.LastChild => LastLineButtonAccessibleObject,
+ NavigateDirection.NavigateDirection_FirstChild => FirstLineButtonAccessibleObject,
+ NavigateDirection.NavigateDirection_LastChild => LastLineButtonAccessibleObject,
_ => base.FragmentNavigate(direction)
};
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ScrollBar.ScrollBarChildAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ScrollBar.ScrollBarChildAccessibleObject.cs
index c9f135b68d2..4343f8c13fd 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ScrollBar.ScrollBarChildAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ScrollBar.ScrollBarChildAccessibleObject.cs
@@ -63,10 +63,10 @@ internal override int[] RuntimeId
GetChildId()
};
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
=> direction switch
{
- UiaCore.NavigateDirection.Parent => ParentInternal,
+ NavigateDirection.NavigateDirection_Parent => ParentInternal,
_ => base.FragmentNavigate(direction)
};
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ScrollBar.ScrollBarFirstLineButtonAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ScrollBar.ScrollBarFirstLineButtonAccessibleObject.cs
index 5868052c7d0..1ea4e76ca8d 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ScrollBar.ScrollBarFirstLineButtonAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ScrollBar.ScrollBarFirstLineButtonAccessibleObject.cs
@@ -1,6 +1,7 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
+using Windows.Win32.UI.Accessibility;
using static Interop.UiaCore;
namespace System.Windows.Forms;
@@ -22,8 +23,8 @@ public ScrollBarFirstLineButtonAccessibleObject(ScrollBar owningScrollBar) : bas
return direction switch
{
- NavigateDirection.PreviousSibling => null,
- NavigateDirection.NextSibling
+ NavigateDirection.NavigateDirection_PreviousSibling => null,
+ NavigateDirection.NavigateDirection_NextSibling
=> ParentInternal.FirstPageButtonAccessibleObject?.IsDisplayed == true
? ParentInternal.FirstPageButtonAccessibleObject
: ParentInternal.ThumbAccessibleObject,
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ScrollBar.ScrollBarFirstPageButtonAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ScrollBar.ScrollBarFirstPageButtonAccessibleObject.cs
index 82ede37c394..e60ea4f7fbc 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ScrollBar.ScrollBarFirstPageButtonAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ScrollBar.ScrollBarFirstPageButtonAccessibleObject.cs
@@ -1,6 +1,7 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
+using Windows.Win32.UI.Accessibility;
using static Interop.UiaCore;
namespace System.Windows.Forms;
@@ -43,8 +44,8 @@ internal override bool IsDisplayed
return direction switch
{
- NavigateDirection.PreviousSibling => IsDisplayed ? ParentInternal.FirstLineButtonAccessibleObject : null,
- NavigateDirection.NextSibling => IsDisplayed ? ParentInternal.ThumbAccessibleObject : null,
+ NavigateDirection.NavigateDirection_PreviousSibling => IsDisplayed ? ParentInternal.FirstLineButtonAccessibleObject : null,
+ NavigateDirection.NavigateDirection_NextSibling => IsDisplayed ? ParentInternal.ThumbAccessibleObject : null,
_ => base.FragmentNavigate(direction)
};
}
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ScrollBar.ScrollBarLastLineButtonAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ScrollBar.ScrollBarLastLineButtonAccessibleObject.cs
index d261a011cd4..eb08705d969 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ScrollBar.ScrollBarLastLineButtonAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ScrollBar.ScrollBarLastLineButtonAccessibleObject.cs
@@ -1,6 +1,7 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
+using Windows.Win32.UI.Accessibility;
using static Interop.UiaCore;
namespace System.Windows.Forms;
@@ -22,8 +23,8 @@ public ScrollBarLastLineButtonAccessibleObject(ScrollBar owningScrollBar) : base
return direction switch
{
- NavigateDirection.NextSibling => null,
- NavigateDirection.PreviousSibling
+ NavigateDirection.NavigateDirection_NextSibling => null,
+ NavigateDirection.NavigateDirection_PreviousSibling
=> ParentInternal.LastPageButtonAccessibleObject?.IsDisplayed == true
? ParentInternal.LastPageButtonAccessibleObject
: ParentInternal.ThumbAccessibleObject,
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ScrollBar.ScrollBarLastPageButtonAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ScrollBar.ScrollBarLastPageButtonAccessibleObject.cs
index ac45f42c092..4b27c86c77c 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ScrollBar.ScrollBarLastPageButtonAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ScrollBar.ScrollBarLastPageButtonAccessibleObject.cs
@@ -1,6 +1,7 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
+using Windows.Win32.UI.Accessibility;
using static Interop.UiaCore;
namespace System.Windows.Forms;
@@ -43,8 +44,8 @@ internal override bool IsDisplayed
return direction switch
{
- NavigateDirection.PreviousSibling => IsDisplayed ? ParentInternal.ThumbAccessibleObject : null,
- NavigateDirection.NextSibling => IsDisplayed ? ParentInternal.LastLineButtonAccessibleObject : null,
+ NavigateDirection.NavigateDirection_PreviousSibling => IsDisplayed ? ParentInternal.ThumbAccessibleObject : null,
+ NavigateDirection.NavigateDirection_NextSibling => IsDisplayed ? ParentInternal.LastLineButtonAccessibleObject : null,
_ => base.FragmentNavigate(direction)
};
}
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ScrollBar.ScrollBarThumbAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ScrollBar.ScrollBarThumbAccessibleObject.cs
index 53bc755946f..571f7528528 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ScrollBar.ScrollBarThumbAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ScrollBar.ScrollBarThumbAccessibleObject.cs
@@ -25,11 +25,11 @@ public ScrollBarThumbAccessibleObject(ScrollBar owningScrollBar) : base(owningSc
return direction switch
{
- NavigateDirection.PreviousSibling
+ NavigateDirection.NavigateDirection_PreviousSibling
=> ParentInternal.FirstPageButtonAccessibleObject?.IsDisplayed == true
? ParentInternal.FirstPageButtonAccessibleObject
: ParentInternal.FirstLineButtonAccessibleObject,
- NavigateDirection.NextSibling
+ NavigateDirection.NavigateDirection_NextSibling
=> ParentInternal.LastPageButtonAccessibleObject?.IsDisplayed == true
? ParentInternal.LastPageButtonAccessibleObject
: ParentInternal.LastLineButtonAccessibleObject,
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/TabControl.TabControlAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/TabControl.TabControlAccessibleObject.cs
index b181becf3d6..e0da7e00c99 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/TabControl.TabControlAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/TabControl.TabControlAccessibleObject.cs
@@ -116,8 +116,8 @@ public override int GetChildCount()
return direction switch
{
- NavigateDirection.FirstChild => owner.SelectedTab?.AccessibilityObject,
- NavigateDirection.LastChild => owner.TabPages.Count > 0
+ NavigateDirection.NavigateDirection_FirstChild => owner.SelectedTab?.AccessibilityObject,
+ NavigateDirection.NavigateDirection_LastChild => owner.TabPages.Count > 0
? owner.TabPages[^1].TabAccessibilityObject
: null,
_ => base.FragmentNavigate(direction)
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/TabPage.TabAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/TabPage.TabAccessibleObject.cs
index 9a3a215383e..d459080a28a 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/TabPage.TabAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/TabPage.TabAccessibleObject.cs
@@ -83,7 +83,7 @@ public override void DoDefaultAction()
internal override void AddToSelection() => DoDefaultAction();
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
{
if (OwningTabControl is null || !OwningTabControl.IsHandleCreated)
{
@@ -92,9 +92,9 @@ public override void DoDefaultAction()
return direction switch
{
- UiaCore.NavigateDirection.Parent => OwningTabControl.AccessibilityObject,
- UiaCore.NavigateDirection.NextSibling => OwningTabControl.AccessibilityObject.GetChild(GetChildId() + 1),
- UiaCore.NavigateDirection.PreviousSibling => OwningTabControl.AccessibilityObject.GetChild(GetChildId() - 1),
+ NavigateDirection.NavigateDirection_Parent => OwningTabControl.AccessibilityObject,
+ NavigateDirection.NavigateDirection_NextSibling => OwningTabControl.AccessibilityObject.GetChild(GetChildId() + 1),
+ NavigateDirection.NavigateDirection_PreviousSibling => OwningTabControl.AccessibilityObject.GetChild(GetChildId() - 1),
_ => null
};
}
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/TabPage.TabPageAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/TabPage.TabPageAccessibleObject.cs
index ccb45734f0b..d3102fb2240 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/TabPage.TabPageAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/TabPage.TabPageAccessibleObject.cs
@@ -53,7 +53,7 @@ public override Rectangle Bounds
public override int GetChildCount()
=> this.IsOwnerHandleCreated(out TabPage? owningTabPage) ? owningTabPage.Controls.Count : -1;
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
{
if (!this.IsOwnerHandleCreated(out TabPage? _) || OwningTabControl is null)
{
@@ -62,9 +62,9 @@ public override int GetChildCount()
return direction switch
{
- UiaCore.NavigateDirection.Parent => OwningTabControl?.AccessibilityObject,
- UiaCore.NavigateDirection.NextSibling => GetNextSibling(),
- UiaCore.NavigateDirection.PreviousSibling => null,
+ NavigateDirection.NavigateDirection_Parent => OwningTabControl?.AccessibilityObject,
+ NavigateDirection.NavigateDirection_NextSibling => GetNextSibling(),
+ NavigateDirection.NavigateDirection_PreviousSibling => null,
_ => base.FragmentNavigate(direction)
};
}
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/TextBoxBase.cs b/src/System.Windows.Forms/src/System/Windows/Forms/TextBoxBase.cs
index db1b1d236e2..498daabea34 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/TextBoxBase.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/TextBoxBase.cs
@@ -1573,7 +1573,7 @@ protected override void OnTextChanged(EventArgs e)
CommonProperties.xClearPreferredSizeCache(this);
base.OnTextChanged(e);
- if (UiaCore.UiaClientsAreListening())
+ if (PInvoke.UiaClientsAreListening())
{
RaiseAccessibilityTextChangedEvent();
}
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStrip.ToolStripAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStrip.ToolStripAccessibleObject.cs
index 667e14dfffc..448cbbd9e0f 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStrip.ToolStripAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStrip.ToolStripAccessibleObject.cs
@@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
using System.Drawing;
+using Windows.Win32.UI.Accessibility;
using static Interop;
namespace System.Windows.Forms;
@@ -147,7 +148,7 @@ public override int GetChildCount()
return count;
}
- internal AccessibleObject? GetChildFragment(int fragmentIndex, UiaCore.NavigateDirection direction, bool getOverflowItem = false)
+ internal AccessibleObject? GetChildFragment(int fragmentIndex, NavigateDirection direction, bool getOverflowItem = false)
{
if (!this.TryGetOwnerAs(out ToolStrip? owner) || fragmentIndex < 0)
{
@@ -202,15 +203,15 @@ bool ShouldItemBeSkipped(Control hostedControl)
// items that are native controls (their accessible objects are provided by Windows),
// from the accessibility tree. It's necessary, because hosted native controls internally add accessible objects
// to the accessibility tree, and thus create duplicated. To avoid duplicates, remove hosted items with native accessibility objects from the tree.
- AccessibleObject? GetFollowingChildFragment(int index, ToolStripItemCollection items, UiaCore.NavigateDirection direction)
+ AccessibleObject? GetFollowingChildFragment(int index, ToolStripItemCollection items, NavigateDirection direction)
{
switch (direction)
{
// "direction" is not used for navigation. This method is helper only.
// FirstChild, LastChild are used when searching non-native hosted child items of the ToolStrip.
// NextSibling, PreviousSibling are used when searching an item siblings.
- case UiaCore.NavigateDirection.FirstChild:
- case UiaCore.NavigateDirection.NextSibling:
+ case NavigateDirection.NavigateDirection_FirstChild:
+ case NavigateDirection.NavigateDirection_NextSibling:
for (int i = index + 1; i < items.Count; i++)
{
ToolStripItem item = items[i];
@@ -229,8 +230,8 @@ bool ShouldItemBeSkipped(Control hostedControl)
break;
- case UiaCore.NavigateDirection.LastChild:
- case UiaCore.NavigateDirection.PreviousSibling:
+ case NavigateDirection.NavigateDirection_LastChild:
+ case NavigateDirection.NavigateDirection_PreviousSibling:
for (int i = index - 1; i >= 0; i--)
{
ToolStripItem item = items[i];
@@ -377,7 +378,7 @@ internal int GetChildIndex(ToolStripItem.ToolStripItemAccessibleObject child)
internal override UiaCore.IRawElementProviderFragmentRoot FragmentRoot => this;
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
{
if (!this.IsOwnerHandleCreated(out ToolStrip? _))
{
@@ -386,7 +387,7 @@ internal int GetChildIndex(ToolStripItem.ToolStripItemAccessibleObject child)
switch (direction)
{
- case UiaCore.NavigateDirection.FirstChild:
+ case NavigateDirection.NavigateDirection_FirstChild:
int childCount = GetChildFragmentCount();
if (childCount > 0)
{
@@ -394,7 +395,7 @@ internal int GetChildIndex(ToolStripItem.ToolStripItemAccessibleObject child)
}
break;
- case UiaCore.NavigateDirection.LastChild:
+ case NavigateDirection.NavigateDirection_LastChild:
childCount = GetChildFragmentCount();
if (childCount > 0)
{
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripButton.ToolStripButtonAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripButton.ToolStripButtonAccessibleObject.cs
index f2e4ae99089..5de84e14d68 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripButton.ToolStripButtonAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripButton.ToolStripButtonAccessibleObject.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
using Windows.Win32.UI.Accessibility;
-using static Interop;
namespace System.Windows.Forms;
@@ -76,7 +75,7 @@ internal override void Toggle()
}
}
- internal override UiaCore.ToggleState ToggleState
+ internal override ToggleState ToggleState
=> CheckStateToToggleState(_ownerItem.CheckState);
internal void OnCheckStateChanged(CheckState oldValue, CheckState newValue)
@@ -87,12 +86,12 @@ internal void OnCheckStateChanged(CheckState oldValue, CheckState newValue)
CheckStateToToggleState(newValue));
}
- private static UiaCore.ToggleState CheckStateToToggleState(CheckState checkState)
+ private static ToggleState CheckStateToToggleState(CheckState checkState)
=> checkState switch
{
- CheckState.Checked => UiaCore.ToggleState.On,
- CheckState.Unchecked => UiaCore.ToggleState.Off,
- _ => UiaCore.ToggleState.Indeterminate
+ CheckState.Checked => ToggleState.ToggleState_On,
+ CheckState.Unchecked => ToggleState.ToggleState_Off,
+ _ => ToggleState.ToggleState_Indeterminate
};
#endregion
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripComboBox.ToolStripComboBoxControl.ToolStripComboBoxControlAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripComboBox.ToolStripComboBoxControl.ToolStripComboBoxControlAccessibleObject.cs
index 346a0c00fcf..ed748266f31 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripComboBox.ToolStripComboBoxControl.ToolStripComboBoxControlAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripComboBox.ToolStripComboBoxControl.ToolStripComboBoxControlAccessibleObject.cs
@@ -17,13 +17,13 @@ public ToolStripComboBoxControlAccessibleObject(ToolStripComboBoxControl toolStr
{
}
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
{
switch (direction)
{
- case UiaCore.NavigateDirection.Parent:
- case UiaCore.NavigateDirection.PreviousSibling:
- case UiaCore.NavigateDirection.NextSibling:
+ case NavigateDirection.NavigateDirection_Parent:
+ case NavigateDirection.NavigateDirection_PreviousSibling:
+ case NavigateDirection.NavigateDirection_NextSibling:
if (this.TryGetOwnerAs(out ToolStripComboBoxControl? owner))
{
return owner.Owner?.AccessibilityObject.FragmentNavigate(direction);
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripControlHost.ToolStripControlHostAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripControlHost.ToolStripControlHostAccessibleObject.cs
index 17d1c7726a5..a487e0030e1 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripControlHost.ToolStripControlHostAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripControlHost.ToolStripControlHostAccessibleObject.cs
@@ -1,6 +1,7 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
+using Windows.Win32.UI.Accessibility;
using static Interop;
namespace System.Windows.Forms;
@@ -67,10 +68,10 @@ public override AccessibleRole Role
///
/// Indicates the direction in which to navigate.
/// Returns the element in the specified direction.
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
{
- if (direction == UiaCore.NavigateDirection.FirstChild ||
- direction == UiaCore.NavigateDirection.LastChild)
+ if (direction == NavigateDirection.NavigateDirection_FirstChild ||
+ direction == NavigateDirection.NavigateDirection_LastChild)
{
return _ownerItem.Control.AccessibilityObject;
}
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripControlHost.ToolStripHostedControlAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripControlHost.ToolStripHostedControlAccessibleObject.cs
index 4257d77940b..51854689649 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripControlHost.ToolStripHostedControlAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripControlHost.ToolStripHostedControlAccessibleObject.cs
@@ -44,16 +44,16 @@ internal override UiaCore.IRawElementProviderFragmentRoot? FragmentRoot
}
}
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
{
if (_toolStripHostedControl is not null &&
_toolStripControlHost is not null)
{
switch (direction)
{
- case UiaCore.NavigateDirection.Parent:
- case UiaCore.NavigateDirection.PreviousSibling:
- case UiaCore.NavigateDirection.NextSibling:
+ case NavigateDirection.NavigateDirection_Parent:
+ case NavigateDirection.NavigateDirection_PreviousSibling:
+ case NavigateDirection.NavigateDirection_NextSibling:
return _toolStripControlHost.AccessibilityObject.FragmentNavigate(direction);
}
}
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripDropDownItem.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripDropDownItem.cs
index 8170e558648..5429b739e60 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripDropDownItem.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripDropDownItem.cs
@@ -5,7 +5,6 @@
using System.Drawing;
using System.Windows.Forms.Layout;
using Windows.Win32.UI.Accessibility;
-using static Interop;
namespace System.Windows.Forms;
@@ -505,8 +504,8 @@ protected internal virtual void OnDropDownOpened(EventArgs e)
{
accessibleObject.RaiseAutomationPropertyChangedEvent(
UIA_PROPERTY_ID.UIA_ExpandCollapseExpandCollapseStatePropertyId,
- UiaCore.ExpandCollapseState.Collapsed,
- UiaCore.ExpandCollapseState.Expanded);
+ ExpandCollapseState.ExpandCollapseState_Collapsed,
+ ExpandCollapseState.ExpandCollapseState_Expanded);
}
}
@@ -534,8 +533,8 @@ protected internal virtual void OnDropDownClosed(EventArgs e)
{
accessibleObject.RaiseAutomationPropertyChangedEvent(
UIA_PROPERTY_ID.UIA_ExpandCollapseExpandCollapseStatePropertyId,
- UiaCore.ExpandCollapseState.Expanded,
- UiaCore.ExpandCollapseState.Collapsed);
+ ExpandCollapseState.ExpandCollapseState_Expanded,
+ ExpandCollapseState.ExpandCollapseState_Collapsed);
}
}
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripDropDownItemAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripDropDownItemAccessibleObject.cs
index 36856eeb50d..27036b95380 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripDropDownItemAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripDropDownItemAccessibleObject.cs
@@ -79,11 +79,11 @@ internal override void Collapse()
}
}
- internal override UiaCore.ExpandCollapseState ExpandCollapseState
+ internal override ExpandCollapseState ExpandCollapseState
{
get
{
- return _owner.DropDown.Visible ? UiaCore.ExpandCollapseState.Expanded : UiaCore.ExpandCollapseState.Collapsed;
+ return _owner.DropDown.Visible ? ExpandCollapseState.ExpandCollapseState_Expanded : ExpandCollapseState.ExpandCollapseState_Collapsed;
}
}
@@ -107,7 +107,7 @@ public override int GetChildCount()
// Do not expose child items when the submenu is collapsed to prevent Narrator from announcing
// invisible menu items when Narrator is in item's mode (CAPSLOCK + Arrow Left/Right) or
// in scan mode (CAPSLOCK + Space)
- if (ExpandCollapseState == UiaCore.ExpandCollapseState.Collapsed)
+ if (ExpandCollapseState == ExpandCollapseState.ExpandCollapseState_Collapsed)
{
return 0;
}
@@ -161,7 +161,7 @@ internal int GetChildFragmentCount()
return count;
}
- internal AccessibleObject? GetChildFragment(int index, UiaCore.NavigateDirection direction)
+ internal AccessibleObject? GetChildFragment(int index, NavigateDirection direction)
{
if (_owner.DropDown.AccessibilityObject is ToolStrip.ToolStripAccessibleObject toolStripAccessibleObject)
{
@@ -171,12 +171,12 @@ internal int GetChildFragmentCount()
return null;
}
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
{
switch (direction)
{
- case UiaCore.NavigateDirection.NextSibling:
- case UiaCore.NavigateDirection.PreviousSibling:
+ case NavigateDirection.NavigateDirection_NextSibling:
+ case NavigateDirection.NavigateDirection_PreviousSibling:
if (_owner.Owner is not ToolStripDropDown dropDown)
{
break;
@@ -190,7 +190,7 @@ internal int GetChildFragmentCount()
return null;
}
- index += direction == UiaCore.NavigateDirection.NextSibling ? 1 : -1;
+ index += direction == NavigateDirection.NavigateDirection_NextSibling ? 1 : -1;
if (index >= 0 && index < dropDown.DisplayedItems.Count)
{
@@ -204,8 +204,8 @@ internal int GetChildFragmentCount()
}
return null;
- case UiaCore.NavigateDirection.FirstChild:
- case UiaCore.NavigateDirection.LastChild:
+ case NavigateDirection.NavigateDirection_FirstChild:
+ case NavigateDirection.NavigateDirection_LastChild:
// Don't add invisible items to the accessibility tree,
// they might not have been created yet.
return _owner.DropDown.Visible
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripDropDownMenu.ToolStripDropDownMenuAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripDropDownMenu.ToolStripDropDownMenuAccessibleObject.cs
index 5eddd9a3ccf..0cd4a6ea40c 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripDropDownMenu.ToolStripDropDownMenuAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripDropDownMenu.ToolStripDropDownMenuAccessibleObject.cs
@@ -13,10 +13,10 @@ internal class ToolStripDropDownMenuAccessibleObject : ToolStripDropDownAccessib
public ToolStripDropDownMenuAccessibleObject(ToolStripDropDownMenu owner) : base(owner)
{ }
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
=> direction switch
{
- UiaCore.NavigateDirection.Parent when this.TryGetOwnerAs(out ToolStripDropDownMenu? owner)
+ NavigateDirection.NavigateDirection_Parent when this.TryGetOwnerAs(out ToolStripDropDownMenu? owner)
=> owner.OwnerItem?.AccessibilityObject,
_ => base.FragmentNavigate(direction)
};
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripItem.ToolStripItemAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripItem.ToolStripItemAccessibleObject.cs
index 2f3dcf4cc5c..67d30368e74 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripItem.ToolStripItemAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripItem.ToolStripItemAccessibleObject.cs
@@ -332,14 +332,14 @@ internal override UiaCore.IRawElementProviderFragmentRoot? FragmentRoot
///
/// Indicates the direction in which to navigate.
/// Returns the element in the specified direction.
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
{
switch (direction)
{
- case UiaCore.NavigateDirection.Parent:
+ case NavigateDirection.NavigateDirection_Parent:
return Parent;
- case UiaCore.NavigateDirection.NextSibling:
- case UiaCore.NavigateDirection.PreviousSibling:
+ case NavigateDirection.NavigateDirection_NextSibling:
+ case NavigateDirection.NavigateDirection_PreviousSibling:
int index = GetChildFragmentIndex();
if (index == -1)
{
@@ -348,7 +348,7 @@ internal override UiaCore.IRawElementProviderFragmentRoot? FragmentRoot
}
AccessibleObject? sibling = null;
- index += direction == UiaCore.NavigateDirection.NextSibling ? 1 : -1;
+ index += direction == NavigateDirection.NavigateDirection_NextSibling ? 1 : -1;
int itemsCount = GetChildFragmentCount();
if (index >= 0 && index < itemsCount)
{
@@ -361,7 +361,7 @@ internal override UiaCore.IRawElementProviderFragmentRoot? FragmentRoot
return base.FragmentNavigate(direction);
}
- private AccessibleObject? GetChildFragment(int index, UiaCore.NavigateDirection direction)
+ private AccessibleObject? GetChildFragment(int index, NavigateDirection direction)
{
if (Parent is ToolStrip.ToolStripAccessibleObject toolStripParent)
{
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripMenuItem.ToolStripMenuItemAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripMenuItem.ToolStripMenuItemAccessibleObject.cs
index 3a41c9f1e17..601ad302f8a 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripMenuItem.ToolStripMenuItemAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripMenuItem.ToolStripMenuItemAccessibleObject.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
using Windows.Win32.UI.Accessibility;
-using static Interop;
namespace System.Windows.Forms;
@@ -141,12 +140,12 @@ internal override void Toggle()
}
}
- internal override UiaCore.ToggleState ToggleState =>
+ internal override ToggleState ToggleState =>
_owningToolStripMenuItem.CheckState switch
{
- CheckState.Checked => UiaCore.ToggleState.On,
- CheckState.Unchecked => UiaCore.ToggleState.Off,
- _ => UiaCore.ToggleState.Indeterminate
+ CheckState.Checked => ToggleState.ToggleState_On,
+ CheckState.Unchecked => ToggleState.ToggleState_Off,
+ _ => ToggleState.ToggleState_Indeterminate
};
#endregion
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripOverflow.ToolStripOverflowAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripOverflow.ToolStripOverflowAccessibleObject.cs
index a5e2bfa3b90..cfc1d89ac01 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripOverflow.ToolStripOverflowAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripOverflow.ToolStripOverflowAccessibleObject.cs
@@ -26,7 +26,7 @@ public override int GetChildCount()
internal override IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
=> direction switch
{
- NavigateDirection.Parent when this.TryGetOwnerAs(out ToolStripOverflow? owner)
+ NavigateDirection.NavigateDirection_Parent when this.TryGetOwnerAs(out ToolStripOverflow? owner)
=> owner.OwnerItem?.AccessibilityObject,
_ => base.FragmentNavigate(direction),
};
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripOverflowButton.ToolStripOverflowButtonAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripOverflowButton.ToolStripOverflowButtonAccessibleObject.cs
index 4047686b34d..fab6777407a 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripOverflowButton.ToolStripOverflowButtonAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripOverflowButton.ToolStripOverflowButtonAccessibleObject.cs
@@ -1,6 +1,7 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
+using Windows.Win32.UI.Accessibility;
using static Interop;
namespace System.Windows.Forms;
@@ -23,12 +24,12 @@ public override string Name
set => base.Name = value;
}
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
{
switch (direction)
{
- case UiaCore.NavigateDirection.FirstChild:
- case UiaCore.NavigateDirection.LastChild:
+ case NavigateDirection.NavigateDirection_FirstChild:
+ case NavigateDirection.NavigateDirection_LastChild:
// Don't show the inner menu while it is invisible.
// Otherwise it will affect accessibility tree,
// especially for items-controls that have not been created yet.
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripProgressBar.ToolStripProgressBarControlAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripProgressBar.ToolStripProgressBarControlAccessibleObject.cs
index 9f9713e833f..57a7f2d7347 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripProgressBar.ToolStripProgressBarControlAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripProgressBar.ToolStripProgressBarControlAccessibleObject.cs
@@ -25,13 +25,13 @@ internal override UiaCore.IRawElementProviderFragmentRoot? FragmentRoot
}
}
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
{
switch (direction)
{
- case UiaCore.NavigateDirection.Parent:
- case UiaCore.NavigateDirection.PreviousSibling:
- case UiaCore.NavigateDirection.NextSibling:
+ case NavigateDirection.NavigateDirection_Parent:
+ case NavigateDirection.NavigateDirection_PreviousSibling:
+ case NavigateDirection.NavigateDirection_NextSibling:
return _ownerToolStripProgressBarControl.Owner?.AccessibilityObject.FragmentNavigate(direction);
}
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripScrollButton.StickyLabelAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripScrollButton.StickyLabelAccessibleObject.cs
index 48043d645d0..489c7f0f80d 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripScrollButton.StickyLabelAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripScrollButton.StickyLabelAccessibleObject.cs
@@ -17,7 +17,7 @@ public StickyLabelAccessibleObject(StickyLabel owner) : base(owner)
_owner = owner;
}
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
{
if (_owner.OwnerScrollButton?.Parent is not ToolStripDropDownMenu toolStripDropDownMenu)
{
@@ -26,12 +26,12 @@ public StickyLabelAccessibleObject(StickyLabel owner) : base(owner)
return direction switch
{
- UiaCore.NavigateDirection.Parent => toolStripDropDownMenu.AccessibilityObject,
- UiaCore.NavigateDirection.NextSibling
+ NavigateDirection.NavigateDirection_Parent => toolStripDropDownMenu.AccessibilityObject,
+ NavigateDirection.NavigateDirection_NextSibling
=> _owner.UpDirection && toolStripDropDownMenu.Items.Count > 0
? toolStripDropDownMenu.Items[0].AccessibilityObject
: null,
- UiaCore.NavigateDirection.PreviousSibling
+ NavigateDirection.NavigateDirection_PreviousSibling
=> !_owner.UpDirection && toolStripDropDownMenu.Items.Count > 0
? toolStripDropDownMenu.Items[^1].AccessibilityObject
: null,
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripSplitButton.ToolStripSplitButtonExAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripSplitButton.ToolStripSplitButtonExAccessibleObject.cs
index c462e121669..81553afd066 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripSplitButton.ToolStripSplitButtonExAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripSplitButton.ToolStripSplitButtonExAccessibleObject.cs
@@ -67,21 +67,21 @@ internal override void Collapse()
}
}
- internal override UiaCore.ExpandCollapseState ExpandCollapseState
+ internal override ExpandCollapseState ExpandCollapseState
{
get
{
- return _owningToolStripSplitButton.DropDown.Visible ? UiaCore.ExpandCollapseState.Expanded : UiaCore.ExpandCollapseState.Collapsed;
+ return _owningToolStripSplitButton.DropDown.Visible ? ExpandCollapseState.ExpandCollapseState_Expanded : ExpandCollapseState.ExpandCollapseState_Collapsed;
}
}
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
{
switch (direction)
{
- case UiaCore.NavigateDirection.FirstChild:
+ case NavigateDirection.NavigateDirection_FirstChild:
return DropDownItemsCount > 0 ? _owningToolStripSplitButton.DropDown.Items[0].AccessibilityObject : null;
- case UiaCore.NavigateDirection.LastChild:
+ case NavigateDirection.NavigateDirection_LastChild:
return DropDownItemsCount > 0 ? _owningToolStripSplitButton.DropDown.Items[_owningToolStripSplitButton.DropDown.Items.Count - 1].AccessibilityObject : null;
}
@@ -95,7 +95,7 @@ private int DropDownItemsCount
// Do not expose child items when the drop-down is collapsed to prevent Narrator from announcing
// invisible menu items when Narrator is in item's mode (CAPSLOCK + Arrow Left/Right) or
// in scan mode (CAPSLOCK + Space)
- if (ExpandCollapseState == UiaCore.ExpandCollapseState.Collapsed)
+ if (ExpandCollapseState == ExpandCollapseState.ExpandCollapseState_Collapsed)
{
return 0;
}
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripSplitButton.ToolStripSplitButtonUiaProvider.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripSplitButton.ToolStripSplitButtonUiaProvider.cs
index 48e76cab6c8..da930e2acb9 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripSplitButton.ToolStripSplitButtonUiaProvider.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/ToolStripSplitButton.ToolStripSplitButtonUiaProvider.cs
@@ -40,8 +40,8 @@ internal override ExpandCollapseState ExpandCollapseState
internal override IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
=> direction switch
{
- NavigateDirection.FirstChild => base.FragmentNavigate(direction),
- NavigateDirection.LastChild => base.FragmentNavigate(direction),
+ NavigateDirection.NavigateDirection_FirstChild => base.FragmentNavigate(direction),
+ NavigateDirection.NavigateDirection_LastChild => base.FragmentNavigate(direction),
_ => _accessibleObject.FragmentNavigate(direction)
};
}
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/TrackBar.TrackBarAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/TrackBar.TrackBarAccessibleObject.cs
index 6fdaa091370..4e964c9d557 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/TrackBar.TrackBarAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/TrackBar.TrackBarAccessibleObject.cs
@@ -126,7 +126,7 @@ public override int GetChildCount()
return element ?? base.ElementProviderFromPoint(x, y);
}
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
{
if (!this.IsOwnerHandleCreated(out TrackBar? _))
{
@@ -135,8 +135,8 @@ public override int GetChildCount()
return direction switch
{
- UiaCore.NavigateDirection.FirstChild => GetChild(0),
- UiaCore.NavigateDirection.LastChild => (LastButtonAccessibleObject?.IsDisplayed ?? false)
+ NavigateDirection.NavigateDirection_FirstChild => GetChild(0),
+ NavigateDirection.NavigateDirection_LastChild => (LastButtonAccessibleObject?.IsDisplayed ?? false)
? LastButtonAccessibleObject
: ThumbAccessibleObject,
_ => base.FragmentNavigate(direction)
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/TrackBar.TrackBarChildAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/TrackBar.TrackBarChildAccessibleObject.cs
index 4fa918ade6f..a2efc16cedc 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/TrackBar.TrackBarChildAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/TrackBar.TrackBarChildAccessibleObject.cs
@@ -58,10 +58,10 @@ internal override int[] RuntimeId
GetChildId()
};
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
=> direction switch
{
- UiaCore.NavigateDirection.Parent => ParentInternal,
+ NavigateDirection.NavigateDirection_Parent => ParentInternal,
_ => base.FragmentNavigate(direction)
};
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/TrackBar.TrackBarFirstButtonAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/TrackBar.TrackBarFirstButtonAccessibleObject.cs
index 9c5f7ea5db7..4d9999b64ef 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/TrackBar.TrackBarFirstButtonAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/TrackBar.TrackBarFirstButtonAccessibleObject.cs
@@ -1,6 +1,7 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
+using Windows.Win32.UI.Accessibility;
using static Interop;
namespace System.Windows.Forms;
@@ -38,7 +39,7 @@ internal override bool IsDisplayed
}
}
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
{
if (!this.IsOwnerHandleCreated(out TrackBar? _))
{
@@ -47,8 +48,8 @@ internal override bool IsDisplayed
return direction switch
{
- UiaCore.NavigateDirection.PreviousSibling => null,
- UiaCore.NavigateDirection.NextSibling => IsDisplayed ? ParentInternal?.ThumbAccessibleObject : null,
+ NavigateDirection.NavigateDirection_PreviousSibling => null,
+ NavigateDirection.NavigateDirection_NextSibling => IsDisplayed ? ParentInternal?.ThumbAccessibleObject : null,
_ => base.FragmentNavigate(direction)
};
}
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/TrackBar.TrackBarLastButtonAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/TrackBar.TrackBarLastButtonAccessibleObject.cs
index 848c7530635..405f87c2b45 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/TrackBar.TrackBarLastButtonAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/TrackBar.TrackBarLastButtonAccessibleObject.cs
@@ -1,6 +1,7 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
+using Windows.Win32.UI.Accessibility;
using static Interop;
namespace System.Windows.Forms;
@@ -47,7 +48,7 @@ internal override bool IsDisplayed
}
}
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
{
if (!this.IsOwnerHandleCreated(out TrackBar? _))
{
@@ -56,8 +57,8 @@ internal override bool IsDisplayed
return direction switch
{
- UiaCore.NavigateDirection.PreviousSibling => IsDisplayed ? ParentInternal?.ThumbAccessibleObject : null,
- UiaCore.NavigateDirection.NextSibling => null,
+ NavigateDirection.NavigateDirection_PreviousSibling => IsDisplayed ? ParentInternal?.ThumbAccessibleObject : null,
+ NavigateDirection.NavigateDirection_NextSibling => null,
_ => base.FragmentNavigate(direction)
};
}
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/TrackBar.TrackBarThumbAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/TrackBar.TrackBarThumbAccessibleObject.cs
index b5284377e96..d78be755392 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/TrackBar.TrackBarThumbAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/TrackBar.TrackBarThumbAccessibleObject.cs
@@ -15,7 +15,7 @@ public TrackBarThumbAccessibleObject(TrackBar owningTrackBar) : base(owningTrack
public override string? Name => SR.TrackBarPositionButtonName;
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
{
if (!this.IsOwnerHandleCreated(out TrackBar? _))
{
@@ -24,11 +24,11 @@ public TrackBarThumbAccessibleObject(TrackBar owningTrackBar) : base(owningTrack
return direction switch
{
- UiaCore.NavigateDirection.PreviousSibling
+ NavigateDirection.NavigateDirection_PreviousSibling
=> ParentInternal?.FirstButtonAccessibleObject?.IsDisplayed ?? false
? ParentInternal.FirstButtonAccessibleObject
: null,
- UiaCore.NavigateDirection.NextSibling
+ NavigateDirection.NavigateDirection_NextSibling
=> ParentInternal?.LastButtonAccessibleObject?.IsDisplayed ?? false
? ParentInternal.LastButtonAccessibleObject
: null,
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/TreeNode.TreeNodeAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/TreeNode.TreeNodeAccessibleObject.cs
index cc73f2a05dd..6bbee80bcfd 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/TreeNode.TreeNodeAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/TreeNode.TreeNodeAccessibleObject.cs
@@ -44,13 +44,13 @@ public override string DefaultAction
: SR.AccessibleActionCheck;
}
- UiaCore.ExpandCollapseState expandCollapseState = ExpandCollapseState;
- if (expandCollapseState == UiaCore.ExpandCollapseState.LeafNode)
+ ExpandCollapseState expandCollapseState = ExpandCollapseState;
+ if (expandCollapseState == ExpandCollapseState.ExpandCollapseState_LeafNode)
{
return string.Empty;
}
- return expandCollapseState == UiaCore.ExpandCollapseState.Expanded
+ return expandCollapseState == ExpandCollapseState.ExpandCollapseState_Expanded
? SR.AccessibleActionCollapse
: SR.AccessibleActionExpand;
}
@@ -78,24 +78,24 @@ public override void DoDefaultAction()
internal override UiaCore.IRawElementProviderFragmentRoot FragmentRoot
=> _owningTreeView.AccessibilityObject;
- internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(UiaCore.NavigateDirection direction)
+ internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
=> direction switch
{
- UiaCore.NavigateDirection.Parent
+ NavigateDirection.NavigateDirection_Parent
=> Parent ?? _owningTreeView.AccessibilityObject,
- UiaCore.NavigateDirection.FirstChild
+ NavigateDirection.NavigateDirection_FirstChild
=> _owningTreeNode.IsEditing
? _owningTreeView._labelEdit?.AccessibilityObject
: _owningTreeNode.IsExpanded
? _owningTreeNode.FirstNode?.AccessibilityObject
: null,
- UiaCore.NavigateDirection.LastChild
+ NavigateDirection.NavigateDirection_LastChild
=> _owningTreeNode.IsExpanded
? _owningTreeNode.LastNode?.AccessibilityObject
: null,
- UiaCore.NavigateDirection.NextSibling
+ NavigateDirection.NavigateDirection_NextSibling
=> _owningTreeNode.NextNode?.AccessibilityObject,
- UiaCore.NavigateDirection.PreviousSibling
+ NavigateDirection.NavigateDirection_PreviousSibling
=> _owningTreeNode.PrevNode?.AccessibilityObject,
_ => base.FragmentNavigate(direction),
};
@@ -160,11 +160,11 @@ public override AccessibleStates State
state |= AccessibleStates.Invisible | AccessibleStates.Offscreen;
}
- if (ExpandCollapseState == UiaCore.ExpandCollapseState.Expanded)
+ if (ExpandCollapseState == ExpandCollapseState.ExpandCollapseState_Expanded)
{
state |= AccessibleStates.Expanded;
}
- else if (ExpandCollapseState == UiaCore.ExpandCollapseState.Collapsed)
+ else if (ExpandCollapseState == ExpandCollapseState.ExpandCollapseState_Collapsed)
{
state |= AccessibleStates.Collapsed;
}
@@ -205,18 +205,18 @@ internal override void Collapse()
_owningTreeNode.Collapse();
}
- internal override UiaCore.ExpandCollapseState ExpandCollapseState
+ internal override ExpandCollapseState ExpandCollapseState
{
get
{
if (_owningTreeNode.Nodes.Count == 0)
{
- return UiaCore.ExpandCollapseState.LeafNode;
+ return ExpandCollapseState.ExpandCollapseState_LeafNode;
}
return _owningTreeNode.IsExpanded
- ? UiaCore.ExpandCollapseState.Expanded
- : UiaCore.ExpandCollapseState.Collapsed;
+ ? ExpandCollapseState.ExpandCollapseState_Expanded
+ : ExpandCollapseState.ExpandCollapseState_Collapsed;
}
}
@@ -255,8 +255,8 @@ internal override UiaCore.IRawElementProviderSimple? ItemSelectionContainer
internal override void Toggle() => _owningTreeNode.Checked = !_owningTreeNode.Checked;
- internal override UiaCore.ToggleState ToggleState
- => _owningTreeNode.Checked ? UiaCore.ToggleState.On : UiaCore.ToggleState.Off;
+ internal override ToggleState ToggleState
+ => _owningTreeNode.Checked ? ToggleState.ToggleState_On : ToggleState.ToggleState_Off;
#endregion
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/TreeView.TreeViewAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/TreeView.TreeViewAccessibleObject.cs
index 025c77f2680..3af78b49be4 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/TreeView.TreeViewAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/TreeView.TreeViewAccessibleObject.cs
@@ -23,8 +23,8 @@ public TreeViewAccessibleObject(TreeView owningTreeView) : base(owningTreeView)
internal override IRawElementProviderFragment? FragmentNavigate(NavigateDirection direction)
=> direction switch
{
- NavigateDirection.FirstChild => GetChild(0),
- NavigateDirection.LastChild => GetChild(GetChildCount() - 1),
+ NavigateDirection.NavigateDirection_FirstChild => GetChild(0),
+ NavigateDirection.NavigateDirection_LastChild => GetChild(GetChildCount() - 1),
_ => base.FragmentNavigate(direction),
};
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/TreeView.cs b/src/System.Windows.Forms/src/System/Windows/Forms/TreeView.cs
index 54cd7be973c..565f49b818c 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/TreeView.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/TreeView.cs
@@ -2141,10 +2141,10 @@ protected virtual void OnAfterCheck(TreeViewEventArgs e)
if (IsAccessibilityObjectCreated)
{
AccessibleObject nodeAccessibleObject = e.Node!.AccessibilityObject;
- UiaCore.ToggleState newState = nodeAccessibleObject.ToggleState;
- UiaCore.ToggleState oldState = newState == UiaCore.ToggleState.On
- ? UiaCore.ToggleState.Off
- : UiaCore.ToggleState.On;
+ ToggleState newState = nodeAccessibleObject.ToggleState;
+ ToggleState oldState = newState == ToggleState.ToggleState_On
+ ? ToggleState.ToggleState_Off
+ : ToggleState.ToggleState_On;
nodeAccessibleObject.RaiseAutomationPropertyChangedEvent(
UIA_PROPERTY_ID.UIA_ToggleToggleStatePropertyId,
@@ -2173,8 +2173,8 @@ protected internal virtual void OnAfterCollapse(TreeViewEventArgs e)
{
e.Node!.AccessibilityObject.RaiseAutomationPropertyChangedEvent(
UIA_PROPERTY_ID.UIA_ExpandCollapseExpandCollapseStatePropertyId,
- oldValue: UiaCore.ExpandCollapseState.Expanded,
- newValue: (VARIANT)(uint)UiaCore.ExpandCollapseState.Collapsed);
+ oldValue: ExpandCollapseState.ExpandCollapseState_Expanded,
+ newValue: (VARIANT)(uint)ExpandCollapseState.ExpandCollapseState_Collapsed);
}
}
@@ -2198,8 +2198,8 @@ protected virtual void OnAfterExpand(TreeViewEventArgs e)
{
e.Node!.AccessibilityObject.RaiseAutomationPropertyChangedEvent(
UIA_PROPERTY_ID.UIA_ExpandCollapseExpandCollapseStatePropertyId,
- oldValue: UiaCore.ExpandCollapseState.Collapsed,
- newValue: UiaCore.ExpandCollapseState.Expanded);
+ oldValue: ExpandCollapseState.ExpandCollapseState_Collapsed,
+ newValue: ExpandCollapseState.ExpandCollapseState_Expanded);
}
}
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/UpDownBase.UpDownButtons.UpDownButtonsAccessibleObject.DirectionButtonAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/UpDownBase.UpDownButtons.UpDownButtonsAccessibleObject.DirectionButtonAccessibleObject.cs
index 8181ff2c7e3..506f85c25ee 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/UpDownBase.UpDownButtons.UpDownButtonsAccessibleObject.DirectionButtonAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/UpDownBase.UpDownButtons.UpDownButtonsAccessibleObject.DirectionButtonAccessibleObject.cs
@@ -61,11 +61,11 @@ public override void DoDefaultAction()
}
internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(
- UiaCore.NavigateDirection direction) => direction switch
+ NavigateDirection direction) => direction switch
{
- UiaCore.NavigateDirection.Parent => Parent,
- UiaCore.NavigateDirection.NextSibling => _up ? Parent.GetChild(1) : null,
- UiaCore.NavigateDirection.PreviousSibling => _up ? null : Parent.GetChild(0),
+ NavigateDirection.NavigateDirection_Parent => Parent,
+ NavigateDirection.NavigateDirection_NextSibling => _up ? Parent.GetChild(1) : null,
+ NavigateDirection.NavigateDirection_PreviousSibling => _up ? null : Parent.GetChild(0),
_ => base.FragmentNavigate(direction),
};
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/UpDownBase.UpDownButtons.UpDownButtonsAccessibleObject.cs b/src/System.Windows.Forms/src/System/Windows/Forms/UpDownBase.UpDownButtons.UpDownButtonsAccessibleObject.cs
index ea7b811db65..6a36db4e9da 100644
--- a/src/System.Windows.Forms/src/System/Windows/Forms/UpDownBase.UpDownButtons.UpDownButtonsAccessibleObject.cs
+++ b/src/System.Windows.Forms/src/System/Windows/Forms/UpDownBase.UpDownButtons.UpDownButtonsAccessibleObject.cs
@@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
using System.Runtime.InteropServices;
+using Windows.Win32.UI.Accessibility;
using static Interop;
namespace System.Windows.Forms;
@@ -34,10 +35,10 @@ public UpDownButtonsAccessibleObject(UpDownButtons owner) : base(owner)
}
internal override UiaCore.IRawElementProviderFragment? FragmentNavigate(
- UiaCore.NavigateDirection direction) => direction switch
+ NavigateDirection direction) => direction switch
{
- UiaCore.NavigateDirection.FirstChild => GetChild(0),
- UiaCore.NavigateDirection.LastChild => GetChild(1),
+ NavigateDirection.NavigateDirection_FirstChild => GetChild(0),
+ NavigateDirection.NavigateDirection_LastChild => GetChild(1),
_ => base.FragmentNavigate(direction),
};
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/UIIntegrationTests/ListViewTests.cs b/src/System.Windows.Forms/tests/IntegrationTests/UIIntegrationTests/ListViewTests.cs
index 0102a3fcb03..b34b381f1fb 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/UIIntegrationTests/ListViewTests.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/UIIntegrationTests/ListViewTests.cs
@@ -3,6 +3,7 @@
using System.Drawing;
using Windows.Win32.UI.Input.KeyboardAndMouse;
+using Windows.Win32.UI.Accessibility;
using Xunit.Abstractions;
using static Interop.UiaCore;
@@ -109,11 +110,11 @@ await RunTestAsync(async (form, listView) =>
}
[WinFormsTheory]
- [InlineData(2, 2, 150, 150, 0, 1, (int)NavigateDirection.FirstChild)]
- [InlineData(4, 3, 150, 150, 0, 3, (int)NavigateDirection.LastChild)]
- [InlineData(4, 1, 150, 150, 0, 1, (int)NavigateDirection.LastChild)]
- [InlineData(2, 5, 150, 150, 0, 1, (int)NavigateDirection.LastChild)]
- [InlineData(10, 10, 100, 100, 0, 5, (int)NavigateDirection.LastChild)]
+ [InlineData(2, 2, 150, 150, 0, 1, (int)NavigateDirection.NavigateDirection_FirstChild)]
+ [InlineData(4, 3, 150, 150, 0, 3, (int)NavigateDirection.NavigateDirection_LastChild)]
+ [InlineData(4, 1, 150, 150, 0, 1, (int)NavigateDirection.NavigateDirection_LastChild)]
+ [InlineData(2, 5, 150, 150, 0, 1, (int)NavigateDirection.NavigateDirection_LastChild)]
+ [InlineData(10, 10, 100, 100, 0, 5, (int)NavigateDirection.NavigateDirection_LastChild)]
public async Task ListView_Tile_FragmentNavigate_WorksExpectedAsync(int columnCount, int subItemsCount, int width, int height, int itemIndex, int subItemIndex, int direction)
{
await RunTestAsync((form, listView) =>
@@ -132,12 +133,12 @@ await RunTestAsync((form, listView) =>
}
[WinFormsTheory]
- [InlineData(1, 0, 150, 150, (int)NavigateDirection.FirstChild)]
- [InlineData(1, 2, 150, 150, (int)NavigateDirection.FirstChild)]
- [InlineData(2, 1, 10, 10, (int)NavigateDirection.FirstChild)]
- [InlineData(4, 0, 150, 150, (int)NavigateDirection.LastChild)]
- [InlineData(1, 2, 150, 150, (int)NavigateDirection.LastChild)]
- [InlineData(2, 1, 10, 10, (int)NavigateDirection.LastChild)]
+ [InlineData(1, 0, 150, 150, (int)NavigateDirection.NavigateDirection_FirstChild)]
+ [InlineData(1, 2, 150, 150, (int)NavigateDirection.NavigateDirection_FirstChild)]
+ [InlineData(2, 1, 10, 10, (int)NavigateDirection.NavigateDirection_FirstChild)]
+ [InlineData(4, 0, 150, 150, (int)NavigateDirection.NavigateDirection_LastChild)]
+ [InlineData(1, 2, 150, 150, (int)NavigateDirection.NavigateDirection_LastChild)]
+ [InlineData(2, 1, 10, 10, (int)NavigateDirection.NavigateDirection_LastChild)]
public async Task ListView_Tile_FragmentNavigate_ReturnsNullAsync(int columnCount, int subItemsCount, int width, int height, int direction)
{
await RunTestAsync((form, listView) =>
@@ -162,8 +163,8 @@ await RunTestAsync((form, listView) =>
InitializeTileList(listView, columnCount, subItemsCount, tileSize: new Size(100, 100));
AccessibleObject? accessibleObject = listView.Items[0].SubItems[1].AccessibilityObject;
- IRawElementProviderFragment? nextAccessibleObject = accessibleObject?.FragmentNavigate(NavigateDirection.NextSibling);
- IRawElementProviderFragment? previousAccessibleObject = accessibleObject?.FragmentNavigate(NavigateDirection.PreviousSibling);
+ IRawElementProviderFragment? nextAccessibleObject = accessibleObject?.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling);
+ IRawElementProviderFragment? previousAccessibleObject = accessibleObject?.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling);
Assert.Null(nextAccessibleObject);
Assert.Null(previousAccessibleObject);
@@ -262,9 +263,9 @@ await RunTestAsync((form, listView) =>
Application.DoEvents();
AccessibleObject? accessibleObject1 = listView.Items[0].SubItems[1].AccessibilityObject;
- AccessibleObject? accessibleObject2 = (AccessibleObject?)accessibleObject1?.FragmentNavigate(NavigateDirection.NextSibling);
- AccessibleObject? accessibleObject3 = (AccessibleObject?)accessibleObject2?.FragmentNavigate(NavigateDirection.NextSibling);
- AccessibleObject? accessibleObject4 = (AccessibleObject?)accessibleObject3?.FragmentNavigate(NavigateDirection.NextSibling);
+ AccessibleObject? accessibleObject2 = (AccessibleObject?)accessibleObject1?.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling);
+ AccessibleObject? accessibleObject3 = (AccessibleObject?)accessibleObject2?.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling);
+ AccessibleObject? accessibleObject4 = (AccessibleObject?)accessibleObject3?.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling);
Assert.Equal(listView.Items[0].SubItems[2].AccessibilityObject, accessibleObject2);
Assert.Equal(listView.Items[0].SubItems[3].AccessibilityObject, accessibleObject3);
@@ -308,8 +309,8 @@ await RunTestAsync((form, listView) =>
InitializeTileList(listView, columnCount: 5, subItemsCount: 5, tileSize: new Size(50, 40));
AccessibleObject? accessibleObject = listView.Items[0].SubItems[1].AccessibilityObject;
- IRawElementProviderFragment? nextAccessibleObject = accessibleObject?.FragmentNavigate(NavigateDirection.NextSibling);
- IRawElementProviderFragment? previousAccessibleObject = accessibleObject?.FragmentNavigate(NavigateDirection.PreviousSibling);
+ IRawElementProviderFragment? nextAccessibleObject = accessibleObject?.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling);
+ IRawElementProviderFragment? previousAccessibleObject = accessibleObject?.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling);
Assert.Null(nextAccessibleObject);
Assert.Null(previousAccessibleObject);
@@ -326,10 +327,10 @@ await RunTestAsync((form, listView) =>
InitializeTileList(listView, columnCount: 5, subItemsCount: 5, tileSize: new Size(50, 40));
Application.DoEvents();
- AccessibleObject accessibleObject = (AccessibleObject)listView.Items[0].AccessibilityObject.FragmentNavigate(NavigateDirection.FirstChild)!;
+ AccessibleObject accessibleObject = (AccessibleObject)listView.Items[0].AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)!;
- Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.FirstChild));
- Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.LastChild));
+ Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild));
+ Assert.Null(accessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild));
return Task.CompletedTask;
});
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/UIIntegrationTests/PropertyGridInternal/DropDownButton.DropDownButtonAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/IntegrationTests/UIIntegrationTests/PropertyGridInternal/DropDownButton.DropDownButtonAccessibleObjectTests.cs
index 53e64615c79..896eca1929d 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/UIIntegrationTests/PropertyGridInternal/DropDownButton.DropDownButtonAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/UIIntegrationTests/PropertyGridInternal/DropDownButton.DropDownButtonAccessibleObjectTests.cs
@@ -3,8 +3,8 @@
using System.Windows.Forms.PropertyGridInternal.TestUtilities;
using System.Windows.Forms.UITests;
+using Windows.Win32.UI.Accessibility;
using Xunit.Abstractions;
-using static Interop.UiaCore;
namespace System.Windows.Forms.PropertyGridInternal.UITests;
@@ -22,7 +22,7 @@ await RunSingleControlTestAsync>((form, grid) =>
grid.SelectedEntry = grid[nameof(Button.AccessibleRole)];
Assert.Equal(grid.SelectedEntry.AccessibilityObject,
- grid.GridView.DropDownButton.AccessibilityObject.FragmentNavigate(NavigateDirection.Parent));
+ grid.GridView.DropDownButton.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent));
return Task.CompletedTask;
});
@@ -36,7 +36,7 @@ await RunSingleControlTestAsync>((form, grid) =>
grid.SelectedEntry = grid[nameof(Button.AccessibleRole)];
Assert.Equal(grid.GridView.EditAccessibleObject,
- grid.GridView.DropDownButton.AccessibilityObject.FragmentNavigate(NavigateDirection.PreviousSibling));
+ grid.GridView.DropDownButton.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling));
return Task.CompletedTask;
});
@@ -49,7 +49,7 @@ await RunSingleControlTestAsync>((form, grid) =>
{
grid.SelectedEntry = grid[nameof(Button.AccessibleRole)];
- Assert.Null(grid.GridView.DropDownButton.AccessibilityObject.FragmentNavigate(NavigateDirection.NextSibling));
+ Assert.Null(grid.GridView.DropDownButton.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling));
return Task.CompletedTask;
});
@@ -65,7 +65,7 @@ await RunSingleControlTestAsync>((form, grid) =>
grid.SelectedEntry.Expanded = true;
Assert.Equal(grid.SelectedEntry.Children.First().AccessibilityObject,
- grid.GridView.DialogButton.AccessibilityObject.FragmentNavigate(NavigateDirection.NextSibling));
+ grid.GridView.DialogButton.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling));
return Task.CompletedTask;
});
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/UIIntegrationTests/PropertyGridInternal/PropertyDescriptorGridEntry.PropertyDescriptorGridEntryAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/IntegrationTests/UIIntegrationTests/PropertyGridInternal/PropertyDescriptorGridEntry.PropertyDescriptorGridEntryAccessibleObjectTests.cs
index 2f32c08433c..6feab6ef631 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/UIIntegrationTests/PropertyGridInternal/PropertyDescriptorGridEntry.PropertyDescriptorGridEntryAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/UIIntegrationTests/PropertyGridInternal/PropertyDescriptorGridEntry.PropertyDescriptorGridEntryAccessibleObjectTests.cs
@@ -3,8 +3,8 @@
using System.Windows.Forms.PropertyGridInternal.TestUtilities;
using System.Windows.Forms.UITests;
+using Windows.Win32.UI.Accessibility;
using Xunit.Abstractions;
-using static Interop.UiaCore;
namespace System.Windows.Forms.PropertyGridInternal.UITests;
@@ -24,7 +24,7 @@ await RunSingleControlTestAsync>((form, grid) =>
entry.Expanded = true;
Assert.Equal(entry.AccessibilityObject,
- entry.Children.First().AccessibilityObject.FragmentNavigate(NavigateDirection.Parent));
+ entry.Children.First().AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent));
return Task.CompletedTask;
});
@@ -38,7 +38,7 @@ await RunSingleControlTestAsync>((form, grid) =>
GridEntry entry = grid[nameof(Button.Font)];
entry.Expanded = true;
- Assert.Null(entry.Children.First().AccessibilityObject.FragmentNavigate(NavigateDirection.PreviousSibling));
+ Assert.Null(entry.Children.First().AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling));
return Task.CompletedTask;
});
@@ -53,7 +53,7 @@ await RunSingleControlTestAsync>((form, grid) =>
entry.Expanded = true;
Assert.Equal(entry.Children.First().AccessibilityObject,
- entry.Children[1].AccessibilityObject.FragmentNavigate(NavigateDirection.PreviousSibling));
+ entry.Children[1].AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling));
return Task.CompletedTask;
});
@@ -68,7 +68,7 @@ await RunSingleControlTestAsync>((form, grid) =>
grid.SelectedEntry.Expanded = true;
Assert.Equal(grid.GridView.EditAccessibleObject,
- grid.SelectedEntry.Children.First().AccessibilityObject.FragmentNavigate(NavigateDirection.PreviousSibling));
+ grid.SelectedEntry.Children.First().AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling));
return Task.CompletedTask;
});
@@ -83,7 +83,7 @@ await RunSingleControlTestAsync>((form, grid) =>
grid.SelectedEntry.Expanded = true;
Assert.Equal(grid.GridView.DialogButton.AccessibilityObject,
- grid.SelectedEntry.Children.First().AccessibilityObject.FragmentNavigate(NavigateDirection.PreviousSibling));
+ grid.SelectedEntry.Children.First().AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling));
return Task.CompletedTask;
});
@@ -97,7 +97,7 @@ await RunSingleControlTestAsync>((form, grid) =>
GridEntry entry = grid[nameof(Button.Font)];
entry.Expanded = true;
- Assert.Null(entry.Children.Last().AccessibilityObject.FragmentNavigate(NavigateDirection.NextSibling));
+ Assert.Null(entry.Children.Last().AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling));
return Task.CompletedTask;
});
@@ -112,7 +112,7 @@ await RunSingleControlTestAsync>((form, grid) =>
entry.Expanded = true;
Assert.Equal(entry.Children[1].AccessibilityObject,
- entry.Children.First().AccessibilityObject.FragmentNavigate(NavigateDirection.NextSibling));
+ entry.Children.First().AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling));
return Task.CompletedTask;
});
@@ -123,7 +123,7 @@ public async Task PropertyDescriptorGridEntryAccessibleObject_FragmentNavigate_F
{
await RunSingleControlTestAsync>((form, grid) =>
{
- Assert.Null(grid[nameof(Button.Font)].AccessibilityObject.FragmentNavigate(NavigateDirection.FirstChild));
+ Assert.Null(grid[nameof(Button.Font)].AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild));
return Task.CompletedTask;
});
@@ -138,7 +138,7 @@ await RunSingleControlTestAsync>((form, grid) =>
entry.Expanded = true;
Assert.Equal(entry.Children.First().AccessibilityObject,
- entry.AccessibilityObject.FragmentNavigate(NavigateDirection.FirstChild));
+ entry.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild));
return Task.CompletedTask;
});
@@ -154,7 +154,7 @@ await RunSingleControlTestAsync>((form, grid) =>
entry.Expanded = true;
entry.Expanded = false;
- Assert.Null(entry.AccessibilityObject.FragmentNavigate(NavigateDirection.FirstChild));
+ Assert.Null(entry.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild));
return Task.CompletedTask;
});
@@ -168,7 +168,7 @@ await RunSingleControlTestAsync>((form, grid) =>
grid.SelectedEntry = grid[nameof(Button.AccessibleRole)];
Assert.Equal(grid.GridView.EditAccessibleObject,
- grid.SelectedEntry.AccessibilityObject.FragmentNavigate(NavigateDirection.FirstChild));
+ grid.SelectedEntry.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild));
return Task.CompletedTask;
});
@@ -184,7 +184,7 @@ await RunSingleControlTestAsync>((form, grid) =>
grid.PopupEditorAndClose(() =>
Assert.Equal(
grid.GridView.DropDownControlHolder!.AccessibilityObject,
- grid.SelectedEntry.AccessibilityObject.FragmentNavigate(NavigateDirection.FirstChild)));
+ grid.SelectedEntry.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild)));
return Task.CompletedTask;
});
@@ -195,7 +195,7 @@ public async Task PropertyDescriptorGridEntryAccessibleObject_FragmentNavigate_L
{
await RunSingleControlTestAsync>((form, grid) =>
{
- Assert.Null(grid[nameof(Button.Font)].AccessibilityObject.FragmentNavigate(NavigateDirection.LastChild));
+ Assert.Null(grid[nameof(Button.Font)].AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild));
return Task.CompletedTask;
});
@@ -210,7 +210,7 @@ await RunSingleControlTestAsync>((form, grid) =>
entry.Expanded = true;
Assert.Equal(entry.Children.Last().AccessibilityObject,
- entry.AccessibilityObject.FragmentNavigate(NavigateDirection.LastChild));
+ entry.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild));
return Task.CompletedTask;
});
@@ -226,7 +226,7 @@ await RunSingleControlTestAsync>((form, grid) =>
entry.Expanded = true;
entry.Expanded = false;
- Assert.Null(entry.AccessibilityObject.FragmentNavigate(NavigateDirection.LastChild));
+ Assert.Null(entry.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild));
return Task.CompletedTask;
});
@@ -240,7 +240,7 @@ await RunSingleControlTestAsync>((form, grid) =>
grid.SelectedEntry = grid[nameof(Button.Size)];
Assert.Equal(grid.GridView.EditAccessibleObject,
- grid.SelectedEntry.AccessibilityObject.FragmentNavigate(NavigateDirection.LastChild));
+ grid.SelectedEntry.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild));
return Task.CompletedTask;
});
@@ -254,7 +254,7 @@ await RunSingleControlTestAsync>((form, grid) =>
grid.SelectedEntry = grid[nameof(Button.AccessibleRole)];
Assert.Equal(grid.GridView.DropDownButton.AccessibilityObject,
- grid.SelectedEntry.AccessibilityObject.FragmentNavigate(NavigateDirection.LastChild));
+ grid.SelectedEntry.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild));
return Task.CompletedTask;
});
@@ -268,7 +268,7 @@ await RunSingleControlTestAsync>((form, grid) =>
grid.SelectedEntry = grid[nameof(Button.Font)];
Assert.Equal(grid.GridView.DialogButton.AccessibilityObject,
- grid.SelectedEntry.AccessibilityObject.FragmentNavigate(NavigateDirection.LastChild));
+ grid.SelectedEntry.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild));
return Task.CompletedTask;
});
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/UIIntegrationTests/PropertyGridInternal/PropertyGridView.DropDownHolder.DropDownHolderAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/IntegrationTests/UIIntegrationTests/PropertyGridInternal/PropertyGridView.DropDownHolder.DropDownHolderAccessibleObjectTests.cs
index eb145e742d3..cf302af7c25 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/UIIntegrationTests/PropertyGridInternal/PropertyGridView.DropDownHolder.DropDownHolderAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/UIIntegrationTests/PropertyGridInternal/PropertyGridView.DropDownHolder.DropDownHolderAccessibleObjectTests.cs
@@ -3,8 +3,8 @@
using System.Windows.Forms.PropertyGridInternal.TestUtilities;
using System.Windows.Forms.UITests;
+using Windows.Win32.UI.Accessibility;
using Xunit.Abstractions;
-using static Interop.UiaCore;
namespace System.Windows.Forms.PropertyGridInternal.UITests;
@@ -24,7 +24,7 @@ await RunSingleControlTestAsync>((form, grid) =>
grid.PopupEditorAndClose(() =>
Assert.Equal(
grid.SelectedEntry.AccessibilityObject,
- grid.GridView.DropDownControlHolder!.AccessibilityObject.FragmentNavigate(NavigateDirection.Parent)));
+ grid.GridView.DropDownControlHolder!.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent)));
return Task.CompletedTask;
});
@@ -38,7 +38,7 @@ await RunSingleControlTestAsync>((form, grid) =>
grid.SelectedEntry = grid[nameof(Button.AccessibleRole)];
grid.PopupEditorAndClose(() =>
- Assert.Null(grid.GridView.DropDownControlHolder!.AccessibilityObject.FragmentNavigate(NavigateDirection.PreviousSibling)));
+ Assert.Null(grid.GridView.DropDownControlHolder!.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)));
return Task.CompletedTask;
});
@@ -54,7 +54,7 @@ await RunSingleControlTestAsync>((form, grid) =>
grid.PopupEditorAndClose(() =>
Assert.Equal(
grid.GridView.EditAccessibleObject,
- grid.GridView.DropDownControlHolder!.AccessibilityObject.FragmentNavigate(NavigateDirection.NextSibling)));
+ grid.GridView.DropDownControlHolder!.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling)));
return Task.CompletedTask;
});
@@ -71,10 +71,10 @@ await RunSingleControlTestAsync>((form, grid) =>
{
Assert.Equal(
grid.GridView.DropDownListBoxAccessibleObject,
- grid.GridView.DropDownControlHolder!.AccessibilityObject.FragmentNavigate(NavigateDirection.FirstChild));
+ grid.GridView.DropDownControlHolder!.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild));
Assert.Equal(
grid.GridView.DropDownListBoxAccessibleObject,
- grid.GridView.DropDownControlHolder.AccessibilityObject.FragmentNavigate(NavigateDirection.LastChild));
+ grid.GridView.DropDownControlHolder.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild));
});
return Task.CompletedTask;
@@ -90,8 +90,8 @@ await RunSingleControlTestAsync>((form, grid) =>
grid.PopupEditorAndClose(() =>
{
- Assert.Null(grid.GridView.DropDownControlHolder!.AccessibilityObject.FragmentNavigate(NavigateDirection.FirstChild));
- Assert.Null(grid.GridView.DropDownControlHolder.AccessibilityObject.FragmentNavigate(NavigateDirection.LastChild));
+ Assert.Null(grid.GridView.DropDownControlHolder!.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild));
+ Assert.Null(grid.GridView.DropDownControlHolder.AccessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild));
});
return Task.CompletedTask;
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/UIIntegrationTests/PropertyGridInternal/PropertyGridView.GridViewListBox.GridViewListBoxAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/IntegrationTests/UIIntegrationTests/PropertyGridInternal/PropertyGridView.GridViewListBox.GridViewListBoxAccessibleObjectTests.cs
index 301faf0bb86..ffce2113841 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/UIIntegrationTests/PropertyGridInternal/PropertyGridView.GridViewListBox.GridViewListBoxAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/UIIntegrationTests/PropertyGridInternal/PropertyGridView.GridViewListBox.GridViewListBoxAccessibleObjectTests.cs
@@ -3,8 +3,8 @@
using System.Windows.Forms.PropertyGridInternal.TestUtilities;
using System.Windows.Forms.UITests;
+using Windows.Win32.UI.Accessibility;
using Xunit.Abstractions;
-using static Interop.UiaCore;
namespace System.Windows.Forms.PropertyGridInternal.UITests;
@@ -25,7 +25,7 @@ await RunSingleControlTestAsync>((form, grid) =>
{
Assert.Equal(
grid.GridView.DropDownControlHolder!.AccessibilityObject,
- grid.GridView.DropDownListBoxAccessibleObject!.FragmentNavigate(NavigateDirection.Parent));
+ grid.GridView.DropDownListBoxAccessibleObject!.FragmentNavigate(NavigateDirection.NavigateDirection_Parent));
});
return Task.CompletedTask;
@@ -41,7 +41,7 @@ await RunSingleControlTestAsync>((form, grid) =>
grid.PopupEditorAndClose(() =>
{
- Assert.Null(grid.GridView.DropDownListBoxAccessibleObject!.FragmentNavigate(NavigateDirection.PreviousSibling));
+ Assert.Null(grid.GridView.DropDownListBoxAccessibleObject!.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling));
});
return Task.CompletedTask;
@@ -57,7 +57,7 @@ await RunSingleControlTestAsync>((form, grid) =>
grid.PopupEditorAndClose(() =>
{
- Assert.Null(grid.GridView.DropDownListBoxAccessibleObject!.FragmentNavigate(NavigateDirection.NextSibling));
+ Assert.Null(grid.GridView.DropDownListBoxAccessibleObject!.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling));
});
return Task.CompletedTask;
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/UIIntegrationTests/PropertyGridInternal/PropertyGridView.GridViewTextBox.GridViewTextBoxAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/IntegrationTests/UIIntegrationTests/PropertyGridInternal/PropertyGridView.GridViewTextBox.GridViewTextBoxAccessibleObjectTests.cs
index 6d3df7255ce..11fc9a1dea6 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/UIIntegrationTests/PropertyGridInternal/PropertyGridView.GridViewTextBox.GridViewTextBoxAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/IntegrationTests/UIIntegrationTests/PropertyGridInternal/PropertyGridView.GridViewTextBox.GridViewTextBoxAccessibleObjectTests.cs
@@ -3,8 +3,8 @@
using System.Windows.Forms.PropertyGridInternal.TestUtilities;
using System.Windows.Forms.UITests;
+using Windows.Win32.UI.Accessibility;
using Xunit.Abstractions;
-using static Interop.UiaCore;
namespace System.Windows.Forms.PropertyGridInternal.UITests;
@@ -22,7 +22,7 @@ await RunSingleControlTestAsync>((form, grid) =>
grid.SelectedEntry = grid[nameof(Button.Size)];
Assert.Equal(grid.SelectedEntry.AccessibilityObject,
- grid.GridView.EditAccessibleObject.FragmentNavigate(NavigateDirection.Parent));
+ grid.GridView.EditAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent));
return Task.CompletedTask;
});
@@ -35,7 +35,7 @@ await RunSingleControlTestAsync>((form, grid) =>
{
grid.SelectedEntry = grid[nameof(Button.Size)];
- Assert.Null(grid.GridView.EditAccessibleObject.FragmentNavigate(NavigateDirection.PreviousSibling));
+ Assert.Null(grid.GridView.EditAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling));
return Task.CompletedTask;
});
@@ -51,7 +51,7 @@ await RunSingleControlTestAsync>((form, grid) =>
grid.PopupEditorAndClose(onClosingAction: () =>
Assert.Equal(
grid.GridView.DropDownControlHolder!.AccessibilityObject,
- grid.GridView.EditAccessibleObject.FragmentNavigate(NavigateDirection.PreviousSibling)));
+ grid.GridView.EditAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling)));
return Task.CompletedTask;
});
@@ -64,7 +64,7 @@ await RunSingleControlTestAsync>((form, grid) =>
{
grid.SelectedEntry = grid[nameof(Button.Size)];
- Assert.Null(grid.GridView.EditAccessibleObject.FragmentNavigate(NavigateDirection.NextSibling));
+ Assert.Null(grid.GridView.EditAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling));
return Task.CompletedTask;
});
@@ -79,7 +79,7 @@ await RunSingleControlTestAsync>((form, grid) =>
grid.SelectedEntry.Expanded = true;
Assert.Equal(grid.SelectedEntry.Children.First().AccessibilityObject,
- grid.GridView.EditAccessibleObject.FragmentNavigate(NavigateDirection.NextSibling));
+ grid.GridView.EditAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling));
return Task.CompletedTask;
});
@@ -93,7 +93,7 @@ await RunSingleControlTestAsync>((form, grid) =>
grid.SelectedEntry = grid[nameof(Button.FlatStyle)];
Assert.Equal(grid.GridView.DropDownButton.AccessibilityObject,
- grid.GridView.EditAccessibleObject.FragmentNavigate(NavigateDirection.NextSibling));
+ grid.GridView.EditAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling));
return Task.CompletedTask;
});
@@ -107,7 +107,7 @@ await RunSingleControlTestAsync>((form, grid) =>
grid.SelectedEntry = grid[nameof(Button.Font)];
Assert.Equal(grid.GridView.DialogButton.AccessibilityObject,
- grid.GridView.EditAccessibleObject.FragmentNavigate(NavigateDirection.NextSibling));
+ grid.GridView.EditAccessibleObject.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling));
return Task.CompletedTask;
});
diff --git a/src/System.Windows.Forms/tests/InteropTests/AccessibleObjectTests.cs b/src/System.Windows.Forms/tests/InteropTests/AccessibleObjectTests.cs
index 33bec86af2e..b6c2b2a388b 100644
--- a/src/System.Windows.Forms/tests/InteropTests/AccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/InteropTests/AccessibleObjectTests.cs
@@ -7,7 +7,6 @@
using Windows.Win32.System.Ole;
using Windows.Win32.System.Variant;
using Windows.Win32.UI.Accessibility;
-using ProviderOptions = Interop.UiaCore.ProviderOptions;
using static Interop.UiaCore;
namespace System.Windows.Forms.InteropTests;
@@ -67,7 +66,7 @@ public void AccessibleObject_IRawElementProviderSimple_GetHostRawElementProvider
public void AccessibleObject_IRawElementProviderSimpleProviderOptions_Get_ReturnsExpected()
{
var o = new AccessibleObject();
- AssertSuccess(Test_IRawElementProviderSimpleProviderOptions(o, ProviderOptions.ServerSideProvider | ProviderOptions.UseComThreading));
+ AssertSuccess(Test_IRawElementProviderSimpleProviderOptions(o, ProviderOptions.ProviderOptions_ServerSideProvider | ProviderOptions.ProviderOptions_UseComThreading));
}
public static TheoryData GetPatternProvider_TestData() => new()
@@ -190,13 +189,13 @@ public unsafe void AccessibleObject_IRawElementProviderFragmentGetRuntimeId_Invo
}
[WinFormsTheory]
- [InlineData((int)NavigateDirection.Parent - 1)]
- [InlineData((int)NavigateDirection.Parent)]
- [InlineData((int)NavigateDirection.NextSibling)]
- [InlineData((int)NavigateDirection.PreviousSibling)]
- [InlineData((int)NavigateDirection.FirstChild)]
- [InlineData((int)NavigateDirection.LastChild)]
- [InlineData((int)NavigateDirection.LastChild + 1)]
+ [InlineData((int)NavigateDirection.NavigateDirection_Parent - 1)]
+ [InlineData((int)NavigateDirection.NavigateDirection_Parent)]
+ [InlineData((int)NavigateDirection.NavigateDirection_NextSibling)]
+ [InlineData((int)NavigateDirection.NavigateDirection_PreviousSibling)]
+ [InlineData((int)NavigateDirection.NavigateDirection_FirstChild)]
+ [InlineData((int)NavigateDirection.NavigateDirection_LastChild)]
+ [InlineData((int)NavigateDirection.NavigateDirection_LastChild + 1)]
public void AccessibleObject_IRawElementProviderFragmentNavigate_Invoke_ReturnsExpected(int direction)
{
var o = new AccessibleObject();
@@ -266,58 +265,58 @@ public void AccessibleObject_IValueProviderSetValue_Invoke_GetReturnsExpected(st
public void AccessibleObject_IValueProviderCollapse_Invoke_Success()
{
var o = new AccessibleObject();
- AssertSuccess(Test_IExpandCollapseProviderCollapse(o, ExpandCollapseState.Collapsed));
+ AssertSuccess(Test_IExpandCollapseProviderCollapse(o, ExpandCollapseState.ExpandCollapseState_Collapsed));
}
[WinFormsFact]
public void AccessibleObject_IValueProviderCollapse_InvokeAfterExpand_Success()
{
var o = new AccessibleObject();
- AssertSuccess(Test_IExpandCollapseProviderExpand(o, ExpandCollapseState.Collapsed));
- AssertSuccess(Test_IExpandCollapseProviderCollapse(o, ExpandCollapseState.Collapsed));
+ AssertSuccess(Test_IExpandCollapseProviderExpand(o, ExpandCollapseState.ExpandCollapseState_Collapsed));
+ AssertSuccess(Test_IExpandCollapseProviderCollapse(o, ExpandCollapseState.ExpandCollapseState_Collapsed));
}
[WinFormsFact]
public void AccessibleObject_IExpandCollapseProviderExpand_Invoke_Success()
{
var o = new AccessibleObject();
- AssertSuccess(Test_IExpandCollapseProviderCollapse(o, ExpandCollapseState.Collapsed));
+ AssertSuccess(Test_IExpandCollapseProviderCollapse(o, ExpandCollapseState.ExpandCollapseState_Collapsed));
}
[WinFormsFact]
public void AccessibleObject_IExpandCollapseProviderExpand_InvokeAfterCollapse_Success()
{
var o = new AccessibleObject();
- AssertSuccess(Test_IExpandCollapseProviderCollapse(o, ExpandCollapseState.Collapsed));
- AssertSuccess(Test_IExpandCollapseProviderCollapse(o, ExpandCollapseState.Collapsed));
+ AssertSuccess(Test_IExpandCollapseProviderCollapse(o, ExpandCollapseState.ExpandCollapseState_Collapsed));
+ AssertSuccess(Test_IExpandCollapseProviderCollapse(o, ExpandCollapseState.ExpandCollapseState_Collapsed));
}
[WinFormsFact]
public void AccessibleObject_IExpandCollapseProviderExpandCollapseState_Get_ReturnsExpected()
{
var o = new AccessibleObject();
- AssertSuccess(Test_IExpandCollapseProviderGetExpandCollapseState(o, ExpandCollapseState.Collapsed));
+ AssertSuccess(Test_IExpandCollapseProviderGetExpandCollapseState(o, ExpandCollapseState.ExpandCollapseState_Collapsed));
}
[WinFormsFact]
public void AccessibleObject_IToggleProviderToggleState_Get_ReturnsExpected()
{
var o = new AccessibleObject();
- AssertSuccess(Test_IToggleProviderGetToggleState(o, ToggleState.Indeterminate));
+ AssertSuccess(Test_IToggleProviderGetToggleState(o, ToggleState.ToggleState_Indeterminate));
}
[WinFormsFact]
public void AccessibleObject_IToggleProviderToggle_Invoke_Success()
{
var o = new AccessibleObject();
- AssertSuccess(Test_IToggleProviderToggle(o, ToggleState.Indeterminate));
+ AssertSuccess(Test_IToggleProviderToggle(o, ToggleState.ToggleState_Indeterminate));
}
[WinFormsFact]
public void AccessibleObject_ITableProviderRowOrColumnMajor_Get_ReturnsExpected()
{
var o = new AccessibleObject();
- AssertSuccess(Test_ITableProviderGetRowOrColumnMajor(o, RowOrColumnMajor.RowMajor));
+ AssertSuccess(Test_ITableProviderGetRowOrColumnMajor(o, RowOrColumnMajor.RowOrColumnMajor_RowMajor));
}
[WinFormsFact]
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/CategoryGridEntryAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/CategoryGridEntryAccessibleObjectTests.cs
index ed9817f7dc7..6d739d98f38 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/CategoryGridEntryAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/CategoryGridEntryAccessibleObjectTests.cs
@@ -5,7 +5,6 @@
using Windows.Win32.UI.Accessibility;
using static System.Windows.Forms.PropertyGridInternal.CategoryGridEntry;
using static System.Windows.Forms.PropertyGridInternal.PropertyGridView;
-using static Interop;
namespace System.Windows.Forms.Tests.AccessibleObjects;
@@ -70,7 +69,7 @@ public void CategoryGridEntryAccessibleObject_FragmentNavigate_Parent_ReturnsExp
AccessibleObject accessibilityObject = gridView.TopLevelGridEntries[0].AccessibilityObject;
- Assert.Equal(gridView.AccessibilityObject, accessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.Parent));
+ Assert.Equal(gridView.AccessibilityObject, accessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_Parent));
Assert.False(control.IsHandleCreated);
Assert.False(button.IsHandleCreated);
}
@@ -87,8 +86,8 @@ public void CategoryGridEntryAccessibleObject_FragmentNavigate_NextSibling_Retur
AccessibleObject accessibilityObjectCategory2 = gridView.TopLevelGridEntries[1].AccessibilityObject;
AccessibleObject accessibilityObjectLastCategory = gridView.TopLevelGridEntries[^1].AccessibilityObject;
- Assert.Equal(accessibilityObjectCategory2, accessibilityObjectCategory1.FragmentNavigate(UiaCore.NavigateDirection.NextSibling));
- Assert.Null(accessibilityObjectLastCategory.FragmentNavigate(UiaCore.NavigateDirection.NextSibling));
+ Assert.Equal(accessibilityObjectCategory2, accessibilityObjectCategory1.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling));
+ Assert.Null(accessibilityObjectLastCategory.FragmentNavigate(NavigateDirection.NavigateDirection_NextSibling));
Assert.False(control.IsHandleCreated);
Assert.False(button.IsHandleCreated);
}
@@ -104,8 +103,8 @@ public void CategoryGridEntryAccessibleObject_FragmentNavigate_PreviousSibling_R
AccessibleObject accessibilityObjectCategory1 = gridView.TopLevelGridEntries[0].AccessibilityObject;
AccessibleObject accessibilityObjectCategory2 = gridView.TopLevelGridEntries[1].AccessibilityObject;
- Assert.Null(accessibilityObjectCategory1.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling));
- Assert.Equal(accessibilityObjectCategory1, accessibilityObjectCategory2.FragmentNavigate(UiaCore.NavigateDirection.PreviousSibling));
+ Assert.Null(accessibilityObjectCategory1.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling));
+ Assert.Equal(accessibilityObjectCategory1, accessibilityObjectCategory2.FragmentNavigate(NavigateDirection.NavigateDirection_PreviousSibling));
Assert.False(control.IsHandleCreated);
Assert.False(button.IsHandleCreated);
}
@@ -123,7 +122,7 @@ public void CategoryGridEntryAccessibleObject_FragmentNavigate_FirstChild_Return
AccessibleObject accessibilityObject = category.AccessibilityObject;
AccessibleObject accessibilityObjectFirstItem = gridViewAccessibilityObject.GetFirstChildProperty(category);
- Assert.Equal(accessibilityObjectFirstItem, accessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.FirstChild));
+ Assert.Equal(accessibilityObjectFirstItem, accessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_FirstChild));
Assert.False(control.IsHandleCreated);
Assert.False(button.IsHandleCreated);
}
@@ -141,7 +140,7 @@ public void CategoryGridEntryAccessibleObject_FragmentNavigate_LastChild_Returns
AccessibleObject accessibilityObject = category.AccessibilityObject;
AccessibleObject accessibilityObjectLastItem = gridViewAccessibilityObject.GetLastChildProperty(category);
- Assert.Equal(accessibilityObjectLastItem, accessibilityObject.FragmentNavigate(UiaCore.NavigateDirection.LastChild));
+ Assert.Equal(accessibilityObjectLastItem, accessibilityObject.FragmentNavigate(NavigateDirection.NavigateDirection_LastChild));
Assert.False(control.IsHandleCreated);
Assert.False(button.IsHandleCreated);
}
diff --git a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/CheckBox.CheckBoxAccessibleObjectTests.cs b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/CheckBox.CheckBoxAccessibleObjectTests.cs
index b21445a43e0..0c0a6ab472a 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/CheckBox.CheckBoxAccessibleObjectTests.cs
+++ b/src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/CheckBox.CheckBoxAccessibleObjectTests.cs
@@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
using Windows.Win32.UI.Accessibility;
-using static Interop.UiaCore;
using CheckBoxAccessibleObject = System.Windows.Forms.CheckBox.CheckBoxAccessibleObject;
namespace System.Windows.Forms.Tests.AccessibleObjects;
@@ -94,12 +93,12 @@ public void CheckBoxAccessibleObject_State_ReturnsExpected(bool createControl, A
}
[WinFormsTheory]
- [InlineData(true, CheckState.Checked, (int)ToggleState.On)]
- [InlineData(true, CheckState.Unchecked, (int)ToggleState.Off)]
- [InlineData(true, CheckState.Indeterminate, (int)ToggleState.Indeterminate)]
- [InlineData(false, CheckState.Checked, (int)ToggleState.On)]
- [InlineData(false, CheckState.Unchecked, (int)ToggleState.Off)]
- [InlineData(false, CheckState.Indeterminate, (int)ToggleState.Indeterminate)]
+ [InlineData(true, CheckState.Checked, (int)ToggleState.ToggleState_On)]
+ [InlineData(true, CheckState.Unchecked, (int)ToggleState.ToggleState_Off)]
+ [InlineData(true, CheckState.Indeterminate, (int)ToggleState.ToggleState_Indeterminate)]
+ [InlineData(false, CheckState.Checked, (int)ToggleState.ToggleState_On)]
+ [InlineData(false, CheckState.Unchecked, (int)ToggleState.ToggleState_Off)]
+ [InlineData(false, CheckState.Indeterminate, (int)ToggleState.ToggleState_Indeterminate)]
public void CheckBoxAccessibleObject_ToggleState_ReturnsExpected(bool createControl, CheckState checkState, int toggleState)
{
using var checkBox = new CheckBox() { CheckState = checkState };
@@ -117,21 +116,21 @@ public void CheckBoxAccessibleObject_ToggleState_ReturnsExpected(bool createCont
public static IEnumerable