summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorRyan Lortie <desrt@desrt.ca>2011-11-30 15:25:12 -0500
committerRyan Lortie <desrt@desrt.ca>2011-12-19 12:51:08 -0500
commit618bca13330b54002b756b57f3cf6e7a02f33d13 (patch)
tree934b1e5aa13abb3c1130a4b3f405e46427fc6afd /examples
parentddfbe19b2323e1d78519c0e872c3ec5a9554ab29 (diff)
downloadgtk+-618bca13330b54002b756b57f3cf6e7a02f33d13.tar.gz
bloatpad: use GtkApplicationMenuButton
Diffstat (limited to 'examples')
-rw-r--r--examples/bloatpad.c24
1 files changed, 5 insertions, 19 deletions
diff --git a/examples/bloatpad.c b/examples/bloatpad.c
index cdc4024afa..74eac3174f 100644
--- a/examples/bloatpad.c
+++ b/examples/bloatpad.c
@@ -2,12 +2,6 @@
#include <gtk/gtk.h>
static void
-clicked (GtkButton *button, GtkMenu *menu)
-{
- gtk_menu_popup (menu, NULL, NULL, NULL, NULL, 0, 0);
-}
-
-static void
show_about (GSimpleAction *action,
GVariant *parameter,
gpointer user_data)
@@ -55,28 +49,20 @@ static void
new_window (GApplication *app,
GFile *file)
{
- GtkWidget *window, *grid, *scrolled, *view;
+ GtkWidget *window, *button, *grid, *scrolled, *view;
GtkWidget *menu;
window = gtk_application_window_new (GTK_APPLICATION (app));
g_action_map_add_action_entries (G_ACTION_MAP (window), win_entries, G_N_ELEMENTS (win_entries), window);
- gtk_application_window_set_show_app_menu (GTK_APPLICATION_WINDOW (window), TRUE);
gtk_window_set_title (GTK_WINDOW (window), "Bloatpad");
grid = gtk_grid_new ();
gtk_container_add (GTK_CONTAINER (window), grid);
- menu = gtk_application_window_get_app_menu (GTK_APPLICATION_WINDOW (window));
- if (menu != NULL)
- {
- GtkWidget *button;
-
- button = gtk_button_new ();
- gtk_button_set_image (GTK_BUTTON (button), gtk_image_new_from_icon_name ("help-about", GTK_ICON_SIZE_MENU));
- gtk_widget_set_halign (button, GTK_ALIGN_START);
- gtk_grid_attach (GTK_GRID (grid), button, 0, 0, 1, 1);
- g_signal_connect (button, "clicked", G_CALLBACK (clicked), menu);
- }
+ button = gtk_application_menu_button_new ();
+ gtk_button_set_image (GTK_BUTTON (button), gtk_image_new_from_icon_name ("help-about", GTK_ICON_SIZE_MENU));
+ gtk_widget_set_halign (button, GTK_ALIGN_START);
+ gtk_grid_attach (GTK_GRID (grid), button, 0, 0, 1, 1);
scrolled = gtk_scrolled_window_new (NULL, NULL);
gtk_widget_set_hexpand (scrolled, TRUE);