diff options
| author | William Jon McCann <william.jon.mccann@gmail.com> | 2013-06-27 18:48:46 -0400 |
|---|---|---|
| committer | William Jon McCann <william.jon.mccann@gmail.com> | 2013-06-27 18:48:46 -0400 |
| commit | b86588e9f54aca6fcdf79de4399996a99acfbb5e (patch) | |
| tree | 45fdc7568c10ebd155ac3cab108f0ce65181263a /gtk/gtktoolbutton.c | |
| parent | d741b7b87352db52eee4493cea8d45c9f9ee7342 (diff) | |
| download | gtk+-b86588e9f54aca6fcdf79de4399996a99acfbb5e.tar.gz | |
Deprecate GtkImageMenuItem
Use GtkMenuItem for menus with only text or GMenu for those
with icons for "nouns" and just text for "verbs".
Diffstat (limited to 'gtk/gtktoolbutton.c')
| -rw-r--r-- | gtk/gtktoolbutton.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/gtk/gtktoolbutton.c b/gtk/gtktoolbutton.c index 7999ef82f3..f803eb5053 100644 --- a/gtk/gtktoolbutton.c +++ b/gtk/gtktoolbutton.c @@ -863,8 +863,6 @@ gtk_tool_button_create_menu_proxy (GtkToolItem *item) label = ""; } - G_GNUC_END_IGNORE_DEPRECATIONS; - if (use_mnemonic) menu_item = gtk_image_menu_item_new_with_mnemonic (label); else @@ -876,14 +874,14 @@ gtk_tool_button_create_menu_proxy (GtkToolItem *item) } else if (button->priv->stock_id) { - G_GNUC_BEGIN_IGNORE_DEPRECATIONS; menu_image = gtk_image_new_from_stock (button->priv->stock_id, GTK_ICON_SIZE_MENU); - G_GNUC_END_IGNORE_DEPRECATIONS; } if (menu_image) gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item), menu_image); + G_GNUC_END_IGNORE_DEPRECATIONS; + g_signal_connect_closure_by_id (menu_item, g_signal_lookup ("activate", G_OBJECT_TYPE (menu_item)), 0, g_cclosure_new_object_swap (G_CALLBACK (gtk_button_clicked), |