diff options
author | Matthias Clasen <mclasen@redhat.com> | 2020-02-09 22:24:47 -0500 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2020-02-09 23:12:32 -0500 |
commit | a6c54669007f3932d6e2813e618bb106579fd28f (patch) | |
tree | 13835ffeb8a11f13a6fc142023050a6bac0f9354 /tests/testcombo.c | |
parent | c78971165215ca749af68c3f6f16fb7eca08e142 (diff) | |
download | gtk+-a6c54669007f3932d6e2813e618bb106579fd28f.tar.gz |
Stop using gtk_main and gtk_main_quit
Replace these calls with direct use of GMainContext api.
Diffstat (limited to 'tests/testcombo.c')
-rw-r--r-- | tests/testcombo.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/tests/testcombo.c b/tests/testcombo.c index ade1673f80..d6d6d95f1f 100644 --- a/tests/testcombo.c +++ b/tests/testcombo.c @@ -919,6 +919,17 @@ displayed_row_changed (GtkComboBox *combo, gtk_tree_path_free (path); } +static void +quit_cb (GtkWidget *widget, + gpointer data) +{ + gboolean *done = data; + + *done = TRUE; + + g_main_context_wakeup (NULL); +} + int main (int argc, char **argv) { @@ -932,6 +943,7 @@ main (int argc, char **argv) GtkCellArea *area; gchar *text; gint i; + gboolean done = FALSE; gtk_init (); @@ -939,7 +951,7 @@ main (int argc, char **argv) gtk_widget_set_default_direction (GTK_TEXT_DIR_RTL); window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - g_signal_connect (window, "destroy", gtk_main_quit, NULL); + g_signal_connect (window, "destroy", G_CALLBACK (quit_cb), &done); mainbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2); gtk_container_add (GTK_CONTAINER (window), mainbox); @@ -1286,7 +1298,8 @@ main (int argc, char **argv) gtk_widget_show (window); - gtk_main (); + while (!done) + g_main_context_iteration (NULL, TRUE); return 0; } |