From 883835d17bb67fd567d824d11ec792f42eb70a86 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 18 Oct 2010 09:08:31 +0200 Subject: [PATCH] Don't use old GtkComboBoxEntry in gail Use gtk_combo_box_get_has_entry instead. (cherry picked from commit f891c58432a08df37544d5332decedbabe677d6e) --- modules/other/gail/gailcombobox.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/other/gail/gailcombobox.c b/modules/other/gail/gailcombobox.c index f7dc403f33..fd7df31588 100644 --- a/modules/other/gail/gailcombobox.c +++ b/modules/other/gail/gailcombobox.c @@ -116,7 +116,7 @@ gail_combo_box_real_initialize (AtkObject *obj, atk_object_set_parent (popup, obj); gail_combo_box->popup_set = TRUE; } - if (GTK_IS_COMBO_BOX_ENTRY (combo_box)) + if (gtk_combo_box_get_has_entry (combo_box)) atk_object_set_parent (gtk_widget_get_accessible (gtk_bin_get_child (GTK_BIN (combo_box))), obj); obj->role = ATK_ROLE_COMBO_BOX; @@ -214,7 +214,7 @@ gail_combo_box_get_n_children (AtkObject* obj) return 0; n_children++; - if (GTK_IS_COMBO_BOX_ENTRY (widget)) + if (gtk_combo_box_get_has_entry (GTK_COMBO_BOX (widget))) n_children ++; return n_children; @@ -248,7 +248,7 @@ gail_combo_box_ref_child (AtkObject *obj, box->popup_set = TRUE; } } - else if (i == 1 && GTK_IS_COMBO_BOX_ENTRY (widget)) + else if (i == 1 && gtk_combo_box_get_has_entry (GTK_COMBO_BOX (widget))) { child = gtk_widget_get_accessible (gtk_bin_get_child (GTK_BIN (widget))); }