summaryrefslogtreecommitdiff
path: root/tests/testframe.c
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2020-02-09 22:24:47 -0500
committerMatthias Clasen <mclasen@redhat.com>2020-02-09 23:12:32 -0500
commita6c54669007f3932d6e2813e618bb106579fd28f (patch)
tree13835ffeb8a11f13a6fc142023050a6bac0f9354 /tests/testframe.c
parentc78971165215ca749af68c3f6f16fb7eca08e142 (diff)
downloadgtk+-a6c54669007f3932d6e2813e618bb106579fd28f.tar.gz
Stop using gtk_main and gtk_main_quit
Replace these calls with direct use of GMainContext api.
Diffstat (limited to 'tests/testframe.c')
-rw-r--r--tests/testframe.c17
1 files changed, 15 insertions, 2 deletions
diff --git a/tests/testframe.c b/tests/testframe.c
index 20ca049ec2..75a16ba527 100644
--- a/tests/testframe.c
+++ b/tests/testframe.c
@@ -124,6 +124,17 @@ draw_border_cb (GtkToggleButton *toggle_button, GtkFrame *frame)
gtk_frame_set_shadow_type (frame, shadow_type);
}
+static void
+quit_cb (GtkWidget *widget,
+ gpointer data)
+{
+ gboolean *done = data;
+
+ *done = TRUE;
+
+ g_main_context_wakeup (NULL);
+}
+
int main (int argc, char **argv)
{
GtkWidget *window, *widget;
@@ -132,13 +143,14 @@ int main (int argc, char **argv)
GtkGrid *grid;
gfloat xalign;
gboolean draw_border;
+ gboolean done = FALSE;
gtk_init ();
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_window_set_default_size (GTK_WINDOW (window), 300, 300);
- g_signal_connect (window, "destroy", gtk_main_quit, NULL);
+ g_signal_connect (window, "destroy", G_CALLBACK (quit_cb), &done);
vbox = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 5));
g_object_set (vbox, "margin", 12, NULL);
@@ -194,7 +206,8 @@ int main (int argc, char **argv)
gtk_widget_show (window);
- gtk_main ();
+ while (!done)
+ g_main_context_iteration (NULL, TRUE);
return 0;
}