1 files changed, 47 insertions, 10 deletions

diff --git a/src/plugins/platforms/windows/uiautomation/qwindowsuiaselectionitemprovider.cpp b/src/plugins/platforms/windows/uiautomation/qwindowsuiaselectionitemprovider.cpp
index 14ec29c75b..95bc2f7570 100644
--- a/src/plugins/platforms/windows/uiautomation/qwindowsuiaselectionitemprovider.cpp
+++ b/src/plugins/platforms/windows/uiautomation/qwindowsuiaselectionitemprovider.cpp
@@ -36,12 +36,20 @@ HRESULT STDMETHODCALLTYPE QWindowsUiaSelectionItemProvider::Select()
     if (!accessible)
         return UIA_E_ELEMENTNOTAVAILABLE;
 
+    if (QAccessibleInterface *parent = accessible->parent()) {
+        if (QAccessibleSelectionInterface *selectionInterface = parent->selectionInterface()) {
+            selectionInterface->clear();
+            bool ok = selectionInterface->select(accessible);
+            return ok ? S_OK : S_FALSE;
+        }
+    }
+
     QAccessibleActionInterface *actionInterface = accessible->actionInterface();
     if (!actionInterface)
         return UIA_E_ELEMENTNOTAVAILABLE;
 
-    if (accessible->role() == QAccessible::RadioButton) {
-        // For radio buttons we just invoke the selection action; others are automatically deselected.
+    if (accessible->role() == QAccessible::RadioButton || accessible->role() == QAccessible::PageTab) {
+        // For radio buttons/tabs we just invoke the selection action; others are automatically deselected.
         actionInterface->doAction(QAccessibleActionInterface::pressAction());
     } else {
         // Toggle list item if not already selected. It must be done first to support all selection modes.
@@ -73,12 +81,19 @@ HRESULT STDMETHODCALLTYPE QWindowsUiaSelectionItemProvider::AddToSelection()
     if (!accessible)
         return UIA_E_ELEMENTNOTAVAILABLE;
 
+    if (QAccessibleInterface *parent = accessible->parent()) {
+        if (QAccessibleSelectionInterface *selectionInterface = parent->selectionInterface()) {
+            bool ok = selectionInterface->select(accessible);
+            return ok ? S_OK : S_FALSE;
+        }
+    }
+
     QAccessibleActionInterface *actionInterface = accessible->actionInterface();
     if (!actionInterface)
         return UIA_E_ELEMENTNOTAVAILABLE;
 
-    if (accessible->role() == QAccessible::RadioButton) {
-        // For radio buttons we invoke the selection action.
+    if (accessible->role() == QAccessible::RadioButton || accessible->role() == QAccessible::PageTab) {
+        // For radio buttons and tabs we invoke the selection action.
         actionInterface->doAction(QAccessibleActionInterface::pressAction());
     } else {
         // Toggle list item if not already selected.
@@ -98,11 +113,18 @@ HRESULT STDMETHODCALLTYPE QWindowsUiaSelectionItemProvider::RemoveFromSelection(
     if (!accessible)
         return UIA_E_ELEMENTNOTAVAILABLE;
 
+    if (QAccessibleInterface *parent = accessible->parent()) {
+        if (QAccessibleSelectionInterface *selectionInterface = parent->selectionInterface()) {
+            bool ok = selectionInterface->unselect(accessible);
+            return ok ? S_OK : S_FALSE;
+        }
+    }
+
     QAccessibleActionInterface *actionInterface = accessible->actionInterface();
     if (!actionInterface)
         return UIA_E_ELEMENTNOTAVAILABLE;
 
-    if (accessible->role() != QAccessible::RadioButton) {
+    if (accessible->role() != QAccessible::RadioButton && accessible->role() != QAccessible::PageTab) {
         if (accessible->state().selected) {
             actionInterface->doAction(QAccessibleActionInterface::toggleAction());
         }
@@ -124,8 +146,18 @@ HRESULT STDMETHODCALLTYPE QWindowsUiaSelectionItemProvider::get_IsSelected(BOOL
     if (!accessible)
         return UIA_E_ELEMENTNOTAVAILABLE;
 
+    if (QAccessibleInterface *parent = accessible->parent()) {
+        if (QAccessibleSelectionInterface *selectionInterface = parent->selectionInterface()) {
+            bool selected = selectionInterface->isSelected(accessible);
+            *pRetVal = selected ? TRUE : FALSE;
+            return S_OK;
+        }
+    }
+
     if (accessible->role() == QAccessible::RadioButton)
         *pRetVal = accessible->state().checked;
+    else if (accessible->role() == QAccessible::PageTab)
+        *pRetVal = accessible->state().focused;
     else
         *pRetVal = accessible->state().selected;
     return S_OK;
@@ -144,16 +176,21 @@ HRESULT STDMETHODCALLTYPE QWindowsUiaSelectionItemProvider::get_SelectionContain
     if (!accessible)
         return UIA_E_ELEMENTNOTAVAILABLE;
 
+    QAccessibleInterface *parent = accessible->parent();
+    if (parent && parent->selectionInterface()) {
+        *pRetVal = QWindowsUiaMainProvider::providerForAccessible(parent);
+        return S_OK;
+    }
+
     QAccessibleActionInterface *actionInterface = accessible->actionInterface();
     if (!actionInterface)
         return UIA_E_ELEMENTNOTAVAILABLE;
 
     // Radio buttons do not require a container.
-    if (accessible->role() == QAccessible::ListItem) {
-        if (QAccessibleInterface *parent = accessible->parent()) {
-            if (parent->role() == QAccessible::List) {
-                *pRetVal = QWindowsUiaMainProvider::providerForAccessible(parent);
-            }
+    if (parent) {
+        if ((accessible->role() == QAccessible::ListItem && parent->role() == QAccessible::List)
+                || (accessible->role() == QAccessible::PageTab && parent->role() == QAccessible::PageTabList)) {
+            *pRetVal = QWindowsUiaMainProvider::providerForAccessible(parent);
         }
     }
     return S_OK;