AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

testgtk: Don't use deprecated functions in selection test

Browse Source
This commit is contained in:
Benjamin Otte 2014-04-10 16:53:42 +02:00
parent 5600499c2f
commit 949aa98a8f
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tests/testgtk.c
View File

@ -8900,10 +8900,16 @@ selection_test_received (GtkWidget *tree_view,
} }
void 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; static GdkAtom targets_atom = GDK_NONE;
if (response != GTK_RESPONSE_APPLY)
{
gtk_widget_destroy (dialog);
return;
}
if (targets_atom == GDK_NONE) if (targets_atom == GDK_NONE)
targets_atom = gdk_atom_intern ("TARGETS", FALSE); targets_atom = gdk_atom_intern ("TARGETS", FALSE);
@ -8915,8 +8921,7 @@ void
create_selection_test (GtkWidget *widget) create_selection_test (GtkWidget *widget)
{ {
static GtkWidget *window = NULL; static GtkWidget *window = NULL;
GtkWidget *action_area, *content_area; GtkWidget *content_area;
GtkWidget *button;
GtkWidget *vbox; GtkWidget *vbox;
GtkWidget *scrolled_win; GtkWidget *scrolled_win;
GtkListStore* store; GtkListStore* store;
@ -8937,7 +8942,6 @@ create_selection_test (GtkWidget *widget)
&window); &window);
content_area = gtk_dialog_get_content_area (GTK_DIALOG (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_window_set_title (GTK_WINDOW (window), "Selection Test");
gtk_container_set_border_width (GTK_CONTAINER (window), 0); gtk_container_set_border_width (GTK_CONTAINER (window), 0);
@ -8971,18 +8975,16 @@ create_selection_test (GtkWidget *widget)
G_CALLBACK (selection_test_received), NULL); G_CALLBACK (selection_test_received), NULL);
/* .. And create some buttons */ /* .. And create some buttons */
button = gtk_button_new_with_label ("Get Targets"); gtk_dialog_add_button (GTK_DIALOG (window),
gtk_box_pack_start (GTK_BOX (action_area), button, TRUE, TRUE, 0); "Get Targets",
GTK_RESPONSE_APPLY);
g_signal_connect (button, "clicked", g_signal_connect (window, "response",
G_CALLBACK (selection_test_get_targets), tree_view); G_CALLBACK (selection_test_get_targets), tree_view);
button = gtk_button_new_with_label ("Quit"); gtk_dialog_add_button (GTK_DIALOG (window),
gtk_box_pack_start (GTK_BOX (action_area), button, TRUE, TRUE, 0); "Quit",
GTK_RESPONSE_CLOSE);
g_signal_connect_swapped (button, "clicked",
G_CALLBACK (gtk_widget_destroy),
window);
} }
if (!gtk_widget_get_visible (window)) if (!gtk_widget_get_visible (window))