Author: cazfi Date: Wed Dec 23 22:05:38 2015 New Revision: 31167 URL: http://svn.gna.org/viewcvs/freeciv?rev=31167&view=rev Log: Got rid of deprecated gtk_image_menu_item_...() calls in gtk3x-client.
See patch #6706 Modified: trunk/client/gui-gtk-3.x/diplodlg.c trunk/client/gui-gtk-3.x/menu.c trunk/client/gui-gtk-3.x/optiondlg.c trunk/client/gui-gtk-3.x/wldlg.c Modified: trunk/client/gui-gtk-3.x/diplodlg.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.x/diplodlg.c?rev=31167&r1=31166&r2=31167&view=diff ============================================================================== --- trunk/client/gui-gtk-3.x/diplodlg.c (original) +++ trunk/client/gui-gtk-3.x/diplodlg.c Wed Dec 23 22:05:38 2015 @@ -733,10 +733,7 @@ menu = gtk_menu_new(); pdialog->menu0 = menu; - menuitem = gtk_image_menu_item_new_with_label(_("Add Clause...")); - gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem), - gtk_image_new_from_stock(GTK_STOCK_ADD, - GTK_ICON_SIZE_MENU)); + menuitem = gtk_menu_item_new_with_label(_("Add Clause...")); gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), menu); gtk_menu_shell_append(GTK_MENU_SHELL(menubar), menuitem); g_object_set_data(G_OBJECT(menu), "plr", plr0); @@ -816,10 +813,7 @@ menu = gtk_menu_new(); pdialog->menu1 = menu; - menuitem = gtk_image_menu_item_new_with_label(_("Add Clause...")); - gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem), - gtk_image_new_from_stock(GTK_STOCK_ADD, - GTK_ICON_SIZE_MENU)); + menuitem = gtk_menu_item_new_with_label(_("Add Clause...")); gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), menu); gtk_menu_shell_append(GTK_MENU_SHELL(menubar), menuitem); g_object_set_data(G_OBJECT(menu), "plr", plr1); Modified: trunk/client/gui-gtk-3.x/menu.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.x/menu.c?rev=31167&r1=31166&r2=31167&view=diff ============================================================================== --- trunk/client/gui-gtk-3.x/menu.c (original) +++ trunk/client/gui-gtk-3.x/menu.c Wed Dec 23 22:05:38 2015 @@ -2554,25 +2554,11 @@ governments_iterate(g) { if (g != game.government_during_revolution) { - struct sprite *gsprite; - /* TRANS: %s is a government name */ fc_snprintf(buf, sizeof(buf), _("%s..."), government_name_translation(g)); - item = gtk_image_menu_item_new_with_label(buf); + item = gtk_menu_item_new_with_label(buf); g_object_set_data(G_OBJECT(item), "government", g); - - if ((gsprite = get_government_sprite(tileset, g))) { - GtkWidget *image; - GdkPixbuf *pb = sprite_get_pixbuf(gsprite); - - image = gtk_image_new_from_pixbuf(pb); - g_object_unref(pb); - gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image); - gtk_image_menu_item_set_always_show_image(GTK_IMAGE_MENU_ITEM(item), TRUE); - gtk_widget_show(image); - } - g_signal_connect(item, "activate", G_CALLBACK(government_callback), g); gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); Modified: trunk/client/gui-gtk-3.x/optiondlg.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.x/optiondlg.c?rev=31167&r1=31166&r2=31167&view=diff ============================================================================== --- trunk/client/gui-gtk-3.x/optiondlg.c (original) +++ trunk/client/gui-gtk-3.x/optiondlg.c Wed Dec 23 22:05:38 2015 @@ -193,24 +193,17 @@ menu = gtk_menu_new(); - item = gtk_image_menu_item_new_with_label(_("Refresh this option")); - gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), - gtk_image_new_from_stock(GTK_STOCK_REFRESH, GTK_ICON_SIZE_MENU)); + item = gtk_menu_item_new_with_label(_("Refresh this option")); gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); g_signal_connect(item, "activate", G_CALLBACK(option_refresh_callback), poption); - item = gtk_image_menu_item_new_with_label(_("Reset this option")); - gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), - gtk_image_new_from_stock(GTK_STOCK_CLEAR, GTK_ICON_SIZE_MENU)); + item = gtk_menu_item_new_with_label(_("Reset this option")); gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); g_signal_connect(item, "activate", G_CALLBACK(option_reset_callback), poption); - item = gtk_image_menu_item_new_with_label( - _("Apply the changes for this option")); - gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), - gtk_image_new_from_stock(GTK_STOCK_APPLY, GTK_ICON_SIZE_MENU)); + item = gtk_menu_item_new_with_label(_("Apply the changes for this option")); gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); g_signal_connect(item, "activate", G_CALLBACK(option_apply_callback), poption); Modified: trunk/client/gui-gtk-3.x/wldlg.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.x/wldlg.c?rev=31167&r1=31166&r2=31167&view=diff ============================================================================== --- trunk/client/gui-gtk-3.x/wldlg.c (original) +++ trunk/client/gui-gtk-3.x/wldlg.c Wed Dec 23 22:05:38 2015 @@ -1061,7 +1061,7 @@ { GtkWidget *editor, *table, *sw, *bbox; GtkWidget *src_view, *dst_view, *label, *button; - GtkWidget *menubar, *item, *menu, *image; + GtkWidget *menubar, *item, *menu; GtkWidget *table2, *arrow, *check; GtkSizeGroup *group; GtkListStore *src_store, *dst_store; @@ -1222,9 +1222,7 @@ menu = gtk_menu_new(); - image = gtk_image_new_from_stock(GTK_STOCK_ADD, GTK_ICON_SIZE_MENU); - item = gtk_image_menu_item_new_with_mnemonic(_("_Add Global Worklist")); - gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image); + item = gtk_menu_item_new_with_mnemonic(_("_Add Global Worklist")); gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), menu); gtk_menu_shell_append(GTK_MENU_SHELL(menubar), item); g_signal_connect(menu, "show", _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits