Revision: 7129
Author: ek.kato
Date: Tue May 31 00:39:39 2011
Log: * Merge r7127, r7128 from trunk.
http://code.google.com/p/uim/source/detail?r=7129
Modified:
/branches/1.7/helper/toolbar-common-gtk.c
=======================================
--- /branches/1.7/helper/toolbar-common-gtk.c Wed May 11 21:26:04 2011
+++ /branches/1.7/helper/toolbar-common-gtk.c Tue May 31 00:39:39 2011
@@ -442,7 +442,14 @@
if (i == selected)
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu_item), TRUE);
} else {
- menu_item = gtk_menu_item_new_with_label(label_list->data);
+ menu_item = gtk_image_menu_item_new_with_label(label_list->data);
+ if (register_icon(icon_list->data)) {
+ img = gtk_image_new_from_stock(icon_list->data, GTK_ICON_SIZE_MENU);
+ gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menu_item), img);
+#if GTK_CHECK_VERSION(2, 16, 0)
+ gtk_image_menu_item_set_always_show_image(GTK_IMAGE_MENU_ITEM(menu_item),
TRUE);
+#endif
+ }
}
/* tooltips */
