HildonAnimationActor: make the "show" parameter a gboolean

[hildon] / examples / hildon-app-menu-example.c

diff --git a/examples/hildon-app-menu-example.c b/examples/hildon-app-menu-example.c
index 57b0923..b018056 100644 (file)
--- a/examples/hildon-app-menu-example.c
+++ b/examples/hildon-app-menu-example.c
@@ -23,7 +23,7 @@
  */
 
 #include                                        <gtk/gtk.h>
-#include                                        "hildon.h"
+#include                                        <hildon/hildon.h>
 
 static void
 menu_button_clicked                             (GtkButton *button,
@@ -41,42 +41,52 @@ create_menu                                     (GtkWidget     *label,
                                                  GtkAccelGroup *accel)
 {
     GtkWidget *button;
+    HildonSizeType buttonsize = HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH;
     HildonAppMenu *menu = HILDON_APP_MENU (hildon_app_menu_new ());
 
     /* Options */
-    button = gtk_button_new_with_label ("Menu command one");
+    button = hildon_gtk_button_new (buttonsize);
+    gtk_button_set_label (GTK_BUTTON (button), "Menu command one");
     g_signal_connect_after (button, "clicked", G_CALLBACK (menu_button_clicked), label);
     hildon_app_menu_append (menu, GTK_BUTTON (button));
 
     gtk_widget_add_accelerator (button, "activate", accel, GDK_r, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
 
-    button = gtk_button_new_with_label ("Menu command two");
+    button = hildon_gtk_button_new (buttonsize);
+    gtk_button_set_label (GTK_BUTTON (button), "Menu command two");
     g_signal_connect_after (button, "clicked", G_CALLBACK (menu_button_clicked), label);
     hildon_app_menu_append (menu, GTK_BUTTON (button));
 
-    button = gtk_button_new_with_label ("Menu command three");
+    button = hildon_gtk_button_new (buttonsize);
+    gtk_button_set_label (GTK_BUTTON (button), "Menu command three");
     g_signal_connect_after (button, "clicked", G_CALLBACK (menu_button_clicked), label);
     hildon_app_menu_append (menu, GTK_BUTTON (button));
 
-    button = gtk_button_new_with_label ("Menu command four");
+    button = hildon_gtk_button_new (buttonsize);
+    gtk_button_set_label (GTK_BUTTON (button), "Menu command four");
     g_signal_connect_after (button, "clicked", G_CALLBACK (menu_button_clicked), label);
     hildon_app_menu_append (menu, GTK_BUTTON (button));
 
-    button = gtk_button_new_with_label ("Menu command five");
+    button = hildon_gtk_button_new (buttonsize);
+    gtk_button_set_label (GTK_BUTTON (button), "Menu command five");
     g_signal_connect_after (button, "clicked", G_CALLBACK (menu_button_clicked), label);
     hildon_app_menu_append (menu, GTK_BUTTON (button));
 
     /* Filters */
-    button = gtk_radio_button_new_with_label (NULL, "filter one");
+    button = hildon_gtk_radio_button_new (buttonsize, NULL);
+    gtk_button_set_label (GTK_BUTTON (button), "filter one");
     g_signal_connect_after (button, "clicked", G_CALLBACK (menu_button_clicked), label);
     hildon_app_menu_add_filter (menu, GTK_BUTTON (button));
     gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (button), FALSE);
 
-    button = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (button), "filter two");
+    button = hildon_gtk_radio_button_new_from_widget (buttonsize, GTK_RADIO_BUTTON (button));
+    gtk_button_set_label (GTK_BUTTON (button), "filter two");
     g_signal_connect_after (button, "clicked", G_CALLBACK (menu_button_clicked), label);
     hildon_app_menu_add_filter (menu, GTK_BUTTON (button));
     gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (button), FALSE);
 
+    gtk_widget_show_all (GTK_WIDGET (menu));
+
     return menu;
 }
 
@@ -91,12 +101,7 @@ main                                            (int argc,
     HildonAppMenu *menu;
     GtkAccelGroup *accel;
 
-    gtk_init (&argc, &argv);
-
-    gtk_rc_parse_string ("style \"default\" {\n"
-                         "bg[NORMAL] = \"#505050\""
-                         "}\n"
-                         "class \"HildonAppMenu\" style \"default\"\n");
+    hildon_gtk_init (&argc, &argv);
 
     label = gtk_label_new ("This is an example of the\nHildonAppMenu widget.\n\n"
                            "Click on the titlebar\nto pop up the menu.");
@@ -112,7 +117,7 @@ main                                            (int argc,
 
     menu = create_menu (label2, accel);
 
-    hildon_stackable_window_set_main_menu (HILDON_STACKABLE_WINDOW (win), menu);
+    hildon_window_set_app_menu (HILDON_WINDOW (win), menu);
 
     gtk_window_add_accel_group (GTK_WINDOW (win), accel);
     g_object_unref (accel);