From 7ac6e25ffc8d1ccb4df48144c808f13f356b4eee Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Wed, 21 Oct 2020 22:44:53 +0100 Subject: [PATCH] Use GtkApplication in the examples Some people read the "Getting Started" section as a series of incremental lessons, and having the examples go from GtkApplication to the old style "init / spin the main loop" confuses them. We should be using GtkApplication everywhere in our examples. --- docs/reference/gtk/getting_started.md | 56 +++++++++++++-------------- examples/builder.c | 56 +++++++++++++-------------- 2 files changed, 56 insertions(+), 56 deletions(-) diff --git a/docs/reference/gtk/getting_started.md b/docs/reference/gtk/getting_started.md index be40e5b05d..c2f3057f0d 100644 --- a/docs/reference/gtk/getting_started.md +++ b/docs/reference/gtk/getting_started.md @@ -586,53 +586,53 @@ print_hello (GtkWidget *widget, } static void -quit_cb (GtkWidget *widget, gpointer data) +quit_cb (GtkWindow *window) { - gboolean *done = data; - - *done = TRUE; - - g_main_context_wakeup (NULL); + gtk_window_close (window); } -int -main (int argc, - char *argv[]) +static void +activate (GtkApplication *app, + gpointer user_data) { - GtkBuilder *builder; - GObject *window; - GObject *button; - gboolean done = FALSE; - -#ifdef GTK_SRCDIR - g_chdir (GTK_SRCDIR); -#endif - - gtk_init (); - /* Construct a GtkBuilder instance and load our UI description */ - builder = gtk_builder_new (); + GtkBuilder *builder = gtk_builder_new (); gtk_builder_add_from_file (builder, "builder.ui", NULL); /* Connect signal handlers to the constructed widgets. */ - window = gtk_builder_get_object (builder, "window"); - g_signal_connect (window, "destroy", G_CALLBACK (quit_cb), &done); + GObject *window = gtk_builder_get_object (builder, "window"); + gtk_window_set_application (GTK_WINDOW (window), app); - button = gtk_builder_get_object (builder, "button1"); + GObject *button = gtk_builder_get_object (builder, "button1"); g_signal_connect (button, "clicked", G_CALLBACK (print_hello), NULL); button = gtk_builder_get_object (builder, "button2"); g_signal_connect (button, "clicked", G_CALLBACK (print_hello), NULL); button = gtk_builder_get_object (builder, "quit"); - g_signal_connect (button, "clicked", G_CALLBACK (quit_cb), &done); + g_signal_connect_swapped (button, "clicked", G_CALLBACK (quit_cb), window); gtk_widget_show (GTK_WIDGET (window)); - while (!done) - g_main_context_iteration (NULL, TRUE); + /* We do not need the builder any more */ + g_object_unref (builder); +} - return 0; +int +main (int argc, + char *argv[]) +{ +#ifdef GTK_SRCDIR + g_chdir (GTK_SRCDIR); +#endif + + GtkApplication *app = gtk_application_new ("org.gtk.example", G_APPLICATION_FLAGS_NONE); + g_signal_connect (app, "activate", G_CALLBACK (activate), NULL); + + int status = g_application_run (G_APPLICATION (app), argc, argv); + g_object_unref (app); + + return status; } ``` diff --git a/examples/builder.c b/examples/builder.c index 261a099697..5a93c974ae 100644 --- a/examples/builder.c +++ b/examples/builder.c @@ -11,49 +11,49 @@ print_hello (GtkWidget *widget, static void quit_cb (GtkWidget *widget, gpointer data) { - gboolean *done = data; + GtkWindow *window = data; - *done = TRUE; - - g_main_context_wakeup (NULL); + gtk_window_close (window); } -int -main (int argc, - char *argv[]) +static void +activate (GtkApplication *app, + gpointer user_data) { - GtkBuilder *builder; - GObject *window; - GObject *button; - gboolean done = FALSE; - -#ifdef GTK_SRCDIR - g_chdir (GTK_SRCDIR); -#endif - - gtk_init (); - /* Construct a GtkBuilder instance and load our UI description */ - builder = gtk_builder_new (); + GtkBuilder *builder = gtk_builder_new (); gtk_builder_add_from_file (builder, "builder.ui", NULL); /* Connect signal handlers to the constructed widgets. */ - window = gtk_builder_get_object (builder, "window"); - g_signal_connect (window, "destroy", G_CALLBACK (quit_cb), &done); + GObject *window = gtk_builder_get_object (builder, "window"); + gtk_window_set_application (GTK_WINDOW (window), app); - button = gtk_builder_get_object (builder, "button1"); + GObject *button = gtk_builder_get_object (builder, "button1"); g_signal_connect (button, "clicked", G_CALLBACK (print_hello), NULL); button = gtk_builder_get_object (builder, "button2"); g_signal_connect (button, "clicked", G_CALLBACK (print_hello), NULL); button = gtk_builder_get_object (builder, "quit"); - g_signal_connect (button, "clicked", G_CALLBACK (quit_cb), &done); + g_signal_connect_swapped (button, "clicked", G_CALLBACK (quit_cb), window); gtk_widget_show (GTK_WIDGET (window)); - - while (!done) - g_main_context_iteration (NULL, TRUE); - - return 0; + g_object_unref (builder); +} + +int +main (int argc, + char *argv[]) +{ +#ifdef GTK_SRCDIR + g_chdir (GTK_SRCDIR); +#endif + + GtkApplication *app = gtk_application_new ("org.gtk.example", G_APPLICATION_FLAGS_NONE); + g_signal_connect (app, "activate", G_CALLBACK (activate), NULL); + + int status = g_application_run (G_APPLICATION (app), argc, argv); + g_object_unref (app); + + return status; }