From bf2197c89f912a403b65be9fed8047976677642b Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Thu, 10 Nov 2011 17:00:46 +0000 Subject: examples: Remove compilation warnings --- examples/gtk-clutter-events.c | 14 +++++++------- examples/gtk-clutter-multistage.c | 2 +- examples/gtk-clutter-test-actor.c | 2 +- examples/gtk-clutter-test-scroll.c | 4 ++-- examples/gtk-clutter-window-test.c | 4 +++- examples/gtk-clutter-window-test2.c | 32 +++++++++++++++++++------------- 6 files changed, 33 insertions(+), 25 deletions(-) diff --git a/examples/gtk-clutter-events.c b/examples/gtk-clutter-events.c index 908edf2..4652a2c 100644 --- a/examples/gtk-clutter-events.c +++ b/examples/gtk-clutter-events.c @@ -160,7 +160,7 @@ main (gint argc, gchar **argv) g_signal_connect (widget, "destroy", G_CALLBACK (gtk_main_quit), NULL); /* Create our layout box */ - vbox = gtk_vbox_new (FALSE, 12); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12); gtk_container_add (GTK_CONTAINER (app->window), vbox); widget = gtk_entry_new (); @@ -169,7 +169,7 @@ main (gint argc, gchar **argv) gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0); g_signal_connect (widget, "changed", G_CALLBACK (on_gtk_entry_changed), app); - hbox = gtk_hbox_new (FALSE, 12); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12); gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0); /* Set up clutter & create our stage */ @@ -214,10 +214,10 @@ main (gint argc, gchar **argv) clutter_actor_set_size (actor, 500, 20); /* Create our adjustment widgets */ - vbox = gtk_vbox_new (FALSE, 6); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0); - box = gtk_hbox_new (TRUE, 6); + box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); gtk_box_pack_start (GTK_BOX (vbox), box, FALSE, TRUE, 0); label = gtk_label_new ("Rotate x-axis"); gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0); @@ -225,7 +225,7 @@ main (gint argc, gchar **argv) gtk_box_pack_start (GTK_BOX (box), button, TRUE, TRUE, 0); g_signal_connect (button, "value-changed", G_CALLBACK (on_x_changed), app); - box = gtk_hbox_new (TRUE, 6); + box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); gtk_box_pack_start (GTK_BOX (vbox), box, FALSE, TRUE, 0); label = gtk_label_new ("Rotate y-axis"); gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0); @@ -233,7 +233,7 @@ main (gint argc, gchar **argv) gtk_box_pack_start (GTK_BOX (box), button, TRUE, TRUE, 0); g_signal_connect (button, "value-changed", G_CALLBACK (on_y_changed), app); - box = gtk_hbox_new (TRUE, 6); + box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); gtk_box_pack_start (GTK_BOX (vbox), box, FALSE, TRUE, 0); label = gtk_label_new ("Rotate z-axis"); gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0); @@ -241,7 +241,7 @@ main (gint argc, gchar **argv) gtk_box_pack_start (GTK_BOX (box), button, TRUE, TRUE, 0); g_signal_connect (button, "value-changed", G_CALLBACK (on_z_changed), app); - box = gtk_hbox_new (TRUE, 6); + box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); gtk_box_pack_start (GTK_BOX (vbox), box, FALSE, TRUE, 0); label = gtk_label_new ("Adjust opacity"); gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0); diff --git a/examples/gtk-clutter-multistage.c b/examples/gtk-clutter-multistage.c index 92733a3..8d4bcc9 100644 --- a/examples/gtk-clutter-multistage.c +++ b/examples/gtk-clutter-multistage.c @@ -41,7 +41,7 @@ main (int argc, char *argv[]) stage0 = gtk_clutter_embed_get_stage (GTK_CLUTTER_EMBED (clutter0)); clutter_stage_set_color (CLUTTER_STAGE (stage0), &col0); - vbox = gtk_vbox_new (FALSE, 6); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); gtk_notebook_append_page (GTK_NOTEBOOK (notebook), vbox, gtk_label_new ("Two stages")); diff --git a/examples/gtk-clutter-test-actor.c b/examples/gtk-clutter-test-actor.c index 77ebcd5..ee8151a 100644 --- a/examples/gtk-clutter-test-actor.c +++ b/examples/gtk-clutter-test-actor.c @@ -68,7 +68,7 @@ create_gtk_actor (int i) gtk_actor = gtk_clutter_actor_new (); bin = gtk_clutter_actor_get_widget (GTK_CLUTTER_ACTOR (gtk_actor)); - vbox = gtk_vbox_new (FALSE, 6); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); gtk_container_add (GTK_CONTAINER (bin), vbox); button = gtk_button_new_with_label ("A Button"); diff --git a/examples/gtk-clutter-test-scroll.c b/examples/gtk-clutter-test-scroll.c index 6e6c134..ec17705 100644 --- a/examples/gtk-clutter-test-scroll.c +++ b/examples/gtk-clutter-test-scroll.c @@ -121,7 +121,7 @@ create_gtk_actor (int i) gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); gtk_container_add (GTK_CONTAINER (bin), scroll); - vbox = gtk_vbox_new (FALSE, 6); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scroll), vbox); button = gtk_button_new_with_label ("A Button"); @@ -166,7 +166,7 @@ main (int argc, char *argv[]) g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL); - vbox = gtk_vbox_new (FALSE, 6); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); gtk_container_add (GTK_CONTAINER (window), vbox); clutter = gtk_clutter_embed_new (); diff --git a/examples/gtk-clutter-window-test.c b/examples/gtk-clutter-window-test.c index dfa86af..7cc292c 100644 --- a/examples/gtk-clutter-window-test.c +++ b/examples/gtk-clutter-window-test.c @@ -5,6 +5,7 @@ * Written by Davyd Madeley */ +#include #include #include #include @@ -97,7 +98,8 @@ main (int argc, char **argv) GtkListStore *store; ClutterActor *stage, *actor; - gtk_clutter_init (&argc, &argv); + if (gtk_clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS) + return EXIT_FAILURE; window = gtk_clutter_window_new (); g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL); diff --git a/examples/gtk-clutter-window-test2.c b/examples/gtk-clutter-window-test2.c index 6c8b46a..3f4ecd4 100644 --- a/examples/gtk-clutter-window-test2.c +++ b/examples/gtk-clutter-window-test2.c @@ -5,6 +5,7 @@ * Written by Davyd Madeley */ +#include #include #include #include @@ -120,12 +121,13 @@ button_clicked (GtkButton *button, char *stock_id) } static GtkWidget * -add_button (GtkTable *table, char *stock_id, int row) +add_button (GtkGrid *table, char *stock_id, int row) { GtkWidget *button = gtk_button_new_from_stock (stock_id); - gtk_table_attach_defaults (GTK_TABLE (table), button, - row, row + 1, - row, row + 1); + + gtk_grid_insert_row (GTK_GRID (table), row); + gtk_grid_insert_column (GTK_GRID (table), row); + gtk_grid_attach (GTK_GRID (table), button, row, row, 1, 1); g_signal_connect (button, "clicked", G_CALLBACK (button_clicked), @@ -140,17 +142,21 @@ main (int argc, char **argv) GtkWidget *window, *table; GtkSettings *settings; - gtk_clutter_init (&argc, &argv); + if (gtk_clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS) + return EXIT_FAILURE; window = gtk_clutter_window_new (); - table = gtk_table_new (6, 6, TRUE); - add_button (GTK_TABLE (table), GTK_STOCK_OK, 0); - add_button (GTK_TABLE (table), GTK_STOCK_CANCEL, 1); - add_button (GTK_TABLE (table), GTK_STOCK_CLOSE, 2); - add_button (GTK_TABLE (table), GTK_STOCK_ABOUT, 3); - add_button (GTK_TABLE (table), GTK_STOCK_BOLD, 4); - add_button (GTK_TABLE (table), GTK_STOCK_ITALIC, 5); + table = gtk_grid_new (); + gtk_widget_set_hexpand (table, TRUE); + gtk_widget_set_vexpand (table, TRUE); + + add_button (GTK_GRID (table), GTK_STOCK_OK, 0); + add_button (GTK_GRID (table), GTK_STOCK_CANCEL, 1); + add_button (GTK_GRID (table), GTK_STOCK_CLOSE, 2); + add_button (GTK_GRID (table), GTK_STOCK_ABOUT, 3); + add_button (GTK_GRID (table), GTK_STOCK_BOLD, 4); + add_button (GTK_GRID (table), GTK_STOCK_ITALIC, 5); gtk_container_add (GTK_CONTAINER (window), table); gtk_widget_show_all (window); @@ -168,5 +174,5 @@ main (int argc, char **argv) gtk_main (); - return 0; + return EXIT_SUCCESS; } -- cgit v1.2.1