[Gtk][a11y] Use toggle button in comboboxes for setting a11y.

1 files changed, 18 insertions, 4 deletions

diff --git a/Xwt.Gtk/Xwt.GtkBackend/AccessibleBackend.cs b/Xwt.Gtk/Xwt.GtkBackend/AccessibleBackend.cs
index af47e91e..24919768 100644
--- a/Xwt.Gtk/Xwt.GtkBackend/AccessibleBackend.cs
+++ b/Xwt.Gtk/Xwt.GtkBackend/AccessibleBackend.cs
@@ -24,6 +24,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 using System;
+using System.Linq;
 using Xwt.Accessibility;
 using Xwt.Backends;
 
@@ -59,10 +60,23 @@ namespace Xwt.GtkBackend
 		public void Initialize (IWidgetBackend parentWidget, IAccessibleEventSink eventSink)
 		{
 			var backend = parentWidget as WidgetBackend;
-			if (backend is IComboBoxEntryBackend)
-				Initialize ((backend?.Widget as Gtk.Bin)?.Child, eventSink);
-			else
-				Initialize (backend?.Widget, eventSink);
+			Gtk.Widget nativeWidget = null;
+			
+			// Gtk.ComboBox and Gtk.ComboBoxEntry are containers, so we apply a11y properties to their children.
+			// For Gtk.ComboBoxEntry it is Gtk.Entry, for Gtk.ComboBox -- Gtk.ToggleButton
+			
+			if (backend is IComboBoxEntryBackend) {
+				nativeWidget = (backend?.Widget as Gtk.Bin)?.Child;
+			} else if (backend is IComboBoxBackend) {
+				foreach (var child in ((Gtk.Container)backend.Widget).AllChildren) {
+					if (child is Gtk.ToggleButton) {
+						nativeWidget = (Gtk.Widget)child;
+						break;
+					}
+				}
+			}
+
+			Initialize (nativeWidget ?? backend?.Widget, eventSink);
 		}
 
 		public void Initialize (IPopoverBackend parentPopover, IAccessibleEventSink eventSink)