From 86701517e7d7cb3d2c08a40d76af97308f18902c Mon Sep 17 00:00:00 2001 From: Pablo Barciela Date: Thu, 19 Apr 2018 12:06:40 +0200 Subject: panel-context-menu.c: avoid deprecated GtkImageMenuItem avoid deprecated: gtk_image_menu_item_new_with_mnemonic gtk_image_menu_item_set_image --- mate-panel/libpanel-util/panel-gtk.c | 24 ++++++++++++++++++++++++ mate-panel/libpanel-util/panel-gtk.h | 3 +++ 2 files changed, 27 insertions(+) (limited to 'mate-panel/libpanel-util') diff --git a/mate-panel/libpanel-util/panel-gtk.c b/mate-panel/libpanel-util/panel-gtk.c index 11a7a952..ce6705c4 100644 --- a/mate-panel/libpanel-util/panel-gtk.c +++ b/mate-panel/libpanel-util/panel-gtk.c @@ -159,3 +159,27 @@ panel_file_chooser_dialog_new (const gchar *title, return result; } + +GtkWidget * +panel_image_menu_item_new_from_icon (const gchar *icon_name, + const gchar *label_name) +{ + GtkWidget *icon; + GtkWidget *box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); + + if (icon_name) + icon = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU); + else + icon = gtk_image_new (); + + GtkWidget *label_menu = gtk_label_new_with_mnemonic (g_strconcat (label_name, " ", NULL)); + GtkWidget *menuitem = gtk_menu_item_new (); + + gtk_container_add (GTK_CONTAINER (box), icon); + gtk_container_add (GTK_CONTAINER (box), label_menu); + + gtk_container_add (GTK_CONTAINER (menuitem), box); + gtk_widget_show_all (menuitem); + + return menuitem; +} diff --git a/mate-panel/libpanel-util/panel-gtk.h b/mate-panel/libpanel-util/panel-gtk.h index 078dcb05..80188aed 100644 --- a/mate-panel/libpanel-util/panel-gtk.h +++ b/mate-panel/libpanel-util/panel-gtk.h @@ -46,6 +46,9 @@ GtkWidget* panel_file_chooser_dialog_new (const gchar *title, const gchar *first_button_text, ...); +GtkWidget* panel_image_menu_item_new_from_icon (const gchar *icon_name, + const gchar *label_name); + #ifdef __cplusplus } #endif -- cgit v1.2.1