diff options
Diffstat (limited to 'tests/testcombo.c')
| -rw-r--r-- | tests/testcombo.c | 64 |
1 files changed, 28 insertions, 36 deletions
diff --git a/tests/testcombo.c b/tests/testcombo.c index 65e5b5ec91..5afe202f46 100644 --- a/tests/testcombo.c +++ b/tests/testcombo.c @@ -940,57 +940,57 @@ capital_animation (gpointer data) } static void -setup_combo_entry (GtkWidget *entry_box) +setup_combo_entry (GtkComboBoxText *combo) { - gtk_combo_box_append_text (GTK_COMBO_BOX (entry_box), + gtk_combo_box_text_append_text (combo, "dum de dum"); - gtk_combo_box_append_text (GTK_COMBO_BOX (entry_box), + gtk_combo_box_text_append_text (combo, "la la la"); - gtk_combo_box_append_text (GTK_COMBO_BOX (entry_box), + gtk_combo_box_text_append_text (combo, "la la la dum de dum la la la la la la boom de da la la"); - gtk_combo_box_append_text (GTK_COMBO_BOX (entry_box), + gtk_combo_box_text_append_text (combo, "bloop"); - gtk_combo_box_append_text (GTK_COMBO_BOX (entry_box), + gtk_combo_box_text_append_text (combo, "bleep"); - gtk_combo_box_append_text (GTK_COMBO_BOX (entry_box), + gtk_combo_box_text_append_text (combo, "klaas"); - gtk_combo_box_append_text (GTK_COMBO_BOX (entry_box), + gtk_combo_box_text_append_text (combo, "klaas0"); - gtk_combo_box_append_text (GTK_COMBO_BOX (entry_box), + gtk_combo_box_text_append_text (combo, "klaas1"); - gtk_combo_box_append_text (GTK_COMBO_BOX (entry_box), + gtk_combo_box_text_append_text (combo, "klaas2"); - gtk_combo_box_append_text (GTK_COMBO_BOX (entry_box), + gtk_combo_box_text_append_text (combo, "klaas3"); - gtk_combo_box_append_text (GTK_COMBO_BOX (entry_box), + gtk_combo_box_text_append_text (combo, "klaas4"); - gtk_combo_box_append_text (GTK_COMBO_BOX (entry_box), + gtk_combo_box_text_append_text (combo, "klaas5"); - gtk_combo_box_append_text (GTK_COMBO_BOX (entry_box), + gtk_combo_box_text_append_text (combo, "klaas6"); - gtk_combo_box_append_text (GTK_COMBO_BOX (entry_box), + gtk_combo_box_text_append_text (combo, "klaas7"); - gtk_combo_box_append_text (GTK_COMBO_BOX (entry_box), + gtk_combo_box_text_append_text (combo, "klaas8"); - gtk_combo_box_append_text (GTK_COMBO_BOX (entry_box), + gtk_combo_box_text_append_text (combo, "klaas9"); - gtk_combo_box_append_text (GTK_COMBO_BOX (entry_box), + gtk_combo_box_text_append_text (combo, "klaasa"); - gtk_combo_box_append_text (GTK_COMBO_BOX (entry_box), + gtk_combo_box_text_append_text (combo, "klaasb"); - gtk_combo_box_append_text (GTK_COMBO_BOX (entry_box), + gtk_combo_box_text_append_text (combo, "klaasc"); - gtk_combo_box_append_text (GTK_COMBO_BOX (entry_box), + gtk_combo_box_text_append_text (combo, "klaasd"); - gtk_combo_box_append_text (GTK_COMBO_BOX (entry_box), + gtk_combo_box_text_append_text (combo, "klaase"); - gtk_combo_box_append_text (GTK_COMBO_BOX (entry_box), + gtk_combo_box_text_append_text (combo, "klaasf"); - gtk_combo_box_append_text (GTK_COMBO_BOX (entry_box), + gtk_combo_box_text_append_text (combo, "klaas10"); - gtk_combo_box_append_text (GTK_COMBO_BOX (entry_box), + gtk_combo_box_text_append_text (combo, "klaas11"); - gtk_combo_box_append_text (GTK_COMBO_BOX (entry_box), + gtk_combo_box_text_append_text (combo, "klaas12"); } @@ -1054,7 +1054,6 @@ main (int argc, char **argv) GtkTreePath *path; GtkTreeIter iter; GdkColor color; - GtkListStore *store; gtk_init (&argc, &argv); @@ -1306,15 +1305,8 @@ main (int argc, char **argv) gtk_container_set_border_width (GTK_CONTAINER (boom), 5); gtk_container_add (GTK_CONTAINER (tmp), boom); - store = gtk_list_store_new (1, G_TYPE_STRING); - comboboxtext = g_object_new (GTK_TYPE_COMBO_BOX, - "has-entry", TRUE, - "model", store, - "entry-text-column", 0, - NULL); - g_object_unref (store); - - setup_combo_entry (comboboxtext); + comboboxtext = gtk_combo_box_text_new_with_entry (); + setup_combo_entry (GTK_COMBO_BOX_TEXT (comboboxtext)); gtk_container_add (GTK_CONTAINER (boom), comboboxtext); |