diff options
| author | Benjamin Otte <otte@redhat.com> | 2014-04-10 16:53:42 +0200 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2014-04-10 16:53:42 +0200 |
| commit | 949aa98a8f36a12a122c06080e13bf10177900fd (patch) | |
| tree | 1d6cc23e7adbc907ec8e6baa56c709e9267d49c8 /tests | |
| parent | 5600499c2f98c844f96b8675d9b23d82d671e63b (diff) | |
| download | gtk+-949aa98a8f36a12a122c06080e13bf10177900fd.tar.gz | |
testgtk: Don't use deprecated functions in selection test
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/testgtk.c | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/tests/testgtk.c b/tests/testgtk.c index c82439ed5c..815ad7c8ab 100644 --- a/tests/testgtk.c +++ b/tests/testgtk.c @@ -8900,10 +8900,16 @@ selection_test_received (GtkWidget *tree_view, } void -selection_test_get_targets (GtkWidget *widget, GtkWidget *tree_view) +selection_test_get_targets (GtkWidget *dialog, gint response, GtkWidget *tree_view) { static GdkAtom targets_atom = GDK_NONE; + if (response != GTK_RESPONSE_APPLY) + { + gtk_widget_destroy (dialog); + return; + } + if (targets_atom == GDK_NONE) targets_atom = gdk_atom_intern ("TARGETS", FALSE); @@ -8915,8 +8921,7 @@ void create_selection_test (GtkWidget *widget) { static GtkWidget *window = NULL; - GtkWidget *action_area, *content_area; - GtkWidget *button; + GtkWidget *content_area; GtkWidget *vbox; GtkWidget *scrolled_win; GtkListStore* store; @@ -8937,7 +8942,6 @@ create_selection_test (GtkWidget *widget) &window); content_area = gtk_dialog_get_content_area (GTK_DIALOG (window)); - action_area = gtk_dialog_get_action_area (GTK_DIALOG (window)); gtk_window_set_title (GTK_WINDOW (window), "Selection Test"); gtk_container_set_border_width (GTK_CONTAINER (window), 0); @@ -8971,18 +8975,16 @@ create_selection_test (GtkWidget *widget) G_CALLBACK (selection_test_received), NULL); /* .. And create some buttons */ - button = gtk_button_new_with_label ("Get Targets"); - gtk_box_pack_start (GTK_BOX (action_area), button, TRUE, TRUE, 0); + gtk_dialog_add_button (GTK_DIALOG (window), + "Get Targets", + GTK_RESPONSE_APPLY); - g_signal_connect (button, "clicked", + g_signal_connect (window, "response", G_CALLBACK (selection_test_get_targets), tree_view); - button = gtk_button_new_with_label ("Quit"); - gtk_box_pack_start (GTK_BOX (action_area), button, TRUE, TRUE, 0); - - g_signal_connect_swapped (button, "clicked", - G_CALLBACK (gtk_widget_destroy), - window); + gtk_dialog_add_button (GTK_DIALOG (window), + "Quit", + GTK_RESPONSE_CLOSE); } if (!gtk_widget_get_visible (window)) |