callisto-debian/gtk2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't use old GtkComboBoxEntry in gail

Browse Source 
Use gtk_combo_box_get_has_entry instead.
(cherry picked from commit f891c58432a08df37544d5332decedbabe677d6e)
This commit is contained in:
Christian Dywan
2010-10-18 09:08:31 +02:00
committed by Matthias Clasen
parent 3a90254369
commit 883835d17b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/other/gail/gailcombobox.c
View File

@ -116,7 +116,7 @@ gail_combo_box_real_initialize (AtkObject *obj,
atk_object_set_parent (popup, obj); atk_object_set_parent (popup, obj);
gail_combo_box->popup_set = TRUE; 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); atk_object_set_parent (gtk_widget_get_accessible (gtk_bin_get_child (GTK_BIN (combo_box))), obj);
obj->role = ATK_ROLE_COMBO_BOX; obj->role = ATK_ROLE_COMBO_BOX;
@ -214,7 +214,7 @@ gail_combo_box_get_n_children (AtkObject* obj)
return 0; return 0;
n_children++; n_children++;
if (GTK_IS_COMBO_BOX_ENTRY (widget)) if (gtk_combo_box_get_has_entry (GTK_COMBO_BOX (widget)))
n_children ++; n_children ++;
return n_children; return n_children;
@ -248,7 +248,7 @@ gail_combo_box_ref_child (AtkObject *obj,
box->popup_set = TRUE; 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))); child = gtk_widget_get_accessible (gtk_bin_get_child (GTK_BIN (widget)));
} }