From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49568) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WO3Ao-0000U9-94 for qemu-devel@nongnu.org; Thu, 13 Mar 2014 06:47:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WO3Ag-0002fp-Vb for qemu-devel@nongnu.org; Thu, 13 Mar 2014 06:47:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:63445) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WO3Ag-0002fh-N0 for qemu-devel@nongnu.org; Thu, 13 Mar 2014 06:47:30 -0400 From: Gerd Hoffmann Date: Thu, 13 Mar 2014 11:46:09 +0100 Message-Id: <1394707572-15112-5-git-send-email-kraxel@redhat.com> In-Reply-To: <1394707572-15112-1-git-send-email-kraxel@redhat.com> References: <1394707572-15112-1-git-send-email-kraxel@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 4/7] gtk: Remove use of deprecated stock items List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , Anthony Liguori , Cole Robinson From: Cole Robinson Stock items are deprecated. As are ImageMenuItems. Convert everything to text only MenuItems, with the same text content as mentioned in the conversion guide: https://docs.google.com/spreadsheet/pub?key=3D0AsPAM3pPwxagdGF4THNMMUpjUW= 5xMXZfdUNzMXhEa2c&output=3Dhtml gtk2 users lose their menu icons as well, but I don't think that's enough of a problem to warrant keeping around back compat code. Example error: ui/gtk.c:1328:5: error: =E2=80=98GtkStock=E2=80=99 is deprecated [-Werror= =3Ddeprecated-declarations] ui/gtk.c:1335:5: error: =E2=80=98gtk_image_menu_item_new_from_stock=E2=80= =99 is deprecated (declared at /usr/include/gtk-3.0/gtk/deprecated/gtkima= gemenuitem.h:78): Use 'gtk_menu_item_new' instead [-Werror=3Ddeprecated-d= eclarations] s->zoom_out_item =3D gtk_image_menu_item_new_from_stock(GTK_STOCK_ZO= OM_OUT, NULL); Signed-off-by: Cole Robinson Signed-off-by: Gerd Hoffmann --- ui/gtk.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/ui/gtk.c b/ui/gtk.c index 3f2e5f2..ba4f6e2 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -1274,7 +1274,6 @@ static GtkWidget *gd_create_menu_machine(GtkDisplay= State *s, GtkAccelGroup *acce { GtkWidget *machine_menu; GtkWidget *separator; - GtkStockItem item; =20 machine_menu =3D gtk_menu_new(); gtk_menu_set_accel_group(GTK_MENU(machine_menu), accel_group); @@ -1294,11 +1293,11 @@ static GtkWidget *gd_create_menu_machine(GtkDispl= ayState *s, GtkAccelGroup *acce separator =3D gtk_separator_menu_item_new(); gtk_menu_shell_append(GTK_MENU_SHELL(machine_menu), separator); =20 - s->quit_item =3D gtk_image_menu_item_new_from_stock(GTK_STOCK_QUIT, = NULL); - gtk_stock_lookup(GTK_STOCK_QUIT, &item); + s->quit_item =3D gtk_menu_item_new_with_mnemonic(_("_Quit")); gtk_menu_item_set_accel_path(GTK_MENU_ITEM(s->quit_item), "/Machine/Quit"); - gtk_accel_map_add_entry("/Machine/Quit", item.keyval, item.mod= ifier); + gtk_accel_map_add_entry("/Machine/Quit", + GDK_KEY_q, GDK_CONTROL_MASK); gtk_menu_shell_append(GTK_MENU_SHELL(machine_menu), s->quit_item); =20 return machine_menu; @@ -1314,8 +1313,7 @@ static GtkWidget *gd_create_menu_view(GtkDisplaySta= te *s, GtkAccelGroup *accel_g view_menu =3D gtk_menu_new(); gtk_menu_set_accel_group(GTK_MENU(view_menu), accel_group); =20 - s->full_screen_item =3D - gtk_image_menu_item_new_from_stock(GTK_STOCK_FULLSCREEN, NULL); + s->full_screen_item =3D gtk_menu_item_new_with_mnemonic(_("_Fullscre= en")); gtk_menu_item_set_accel_path(GTK_MENU_ITEM(s->full_screen_item), "/View/Full Screen"); gtk_accel_map_add_entry("/View/Full Screen", GDK_KEY_f, @@ -1325,21 +1323,21 @@ static GtkWidget *gd_create_menu_view(GtkDisplayS= tate *s, GtkAccelGroup *accel_g separator =3D gtk_separator_menu_item_new(); gtk_menu_shell_append(GTK_MENU_SHELL(view_menu), separator); =20 - s->zoom_in_item =3D gtk_image_menu_item_new_from_stock(GTK_STOCK_ZOO= M_IN, NULL); + s->zoom_in_item =3D gtk_menu_item_new_with_mnemonic(_("Zoom _In")); gtk_menu_item_set_accel_path(GTK_MENU_ITEM(s->zoom_in_item), "/View/Zoom In"); gtk_accel_map_add_entry("/View/Zoom In", GDK_KEY_plus, HOTKEY_MODIFIERS); gtk_menu_shell_append(GTK_MENU_SHELL(view_menu), s->zoom_in_item); =20 - s->zoom_out_item =3D gtk_image_menu_item_new_from_stock(GTK_STOCK_ZO= OM_OUT, NULL); + s->zoom_out_item =3D gtk_menu_item_new_with_mnemonic(_("Zoom _Out"))= ; gtk_menu_item_set_accel_path(GTK_MENU_ITEM(s->zoom_out_item), "/View/Zoom Out"); gtk_accel_map_add_entry("/View/Zoom Out", GDK_KEY_minus, HOTKEY_MODIFIERS); gtk_menu_shell_append(GTK_MENU_SHELL(view_menu), s->zoom_out_item); =20 - s->zoom_fixed_item =3D gtk_image_menu_item_new_from_stock(GTK_STOCK_= ZOOM_100, NULL); + s->zoom_fixed_item =3D gtk_menu_item_new_with_mnemonic(_("Best _Fit"= )); gtk_menu_item_set_accel_path(GTK_MENU_ITEM(s->zoom_fixed_item), "/View/Zoom Fixed"); gtk_accel_map_add_entry("/View/Zoom Fixed", GDK_KEY_0, --=20 1.8.3.1