From 74a5fd15d7606b592cf7c77c23ded99ff2b7ec6f Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 12 Nov 2004 20:20:29 +0000 Subject: [PATCH] Adjust to the current entry popup menu. 2004-11-12 Matthias Clasen * gtk/gtklabel.c (gtk_label_do_popup): Adjust to the current entry popup menu. --- ChangeLog | 3 +++ ChangeLog.pre-2-10 | 3 +++ ChangeLog.pre-2-6 | 3 +++ ChangeLog.pre-2-8 | 3 +++ gtk/gtklabel.c | 11 +++++------ 5 files changed, 17 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4677aac0df..15282ce968 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2004-11-12 Matthias Clasen + * gtk/gtklabel.c (gtk_label_do_popup): Adjust to the current + entry popup menu. + Make GDK+ compile with X11R5 (#148032) * gdk/x11/xsettings-client.c (xsettings_client_new): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 4677aac0df..15282ce968 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2004-11-12 Matthias Clasen + * gtk/gtklabel.c (gtk_label_do_popup): Adjust to the current + entry popup menu. + Make GDK+ compile with X11R5 (#148032) * gdk/x11/xsettings-client.c (xsettings_client_new): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 4677aac0df..15282ce968 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,8 @@ 2004-11-12 Matthias Clasen + * gtk/gtklabel.c (gtk_label_do_popup): Adjust to the current + entry popup menu. + Make GDK+ compile with X11R5 (#148032) * gdk/x11/xsettings-client.c (xsettings_client_new): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 4677aac0df..15282ce968 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,8 @@ 2004-11-12 Matthias Clasen + * gtk/gtklabel.c (gtk_label_do_popup): Adjust to the current + entry popup menu. + Make GDK+ compile with X11R5 (#148032) * gdk/x11/xsettings-client.c (xsettings_client_new): diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index 5dd6e751d2..769275f4f2 100644 --- a/gtk/gtklabel.c +++ b/gtk/gtklabel.c @@ -3578,9 +3578,8 @@ gtk_label_do_popup (GtkLabel *label, append_action_signal (label, label->select_info->popup_menu, GTK_STOCK_PASTE, "paste_clipboard", FALSE); - menuitem = gtk_menu_item_new_with_label (_("Select All")); - g_signal_connect_swapped (menuitem, "activate", - G_CALLBACK (gtk_label_select_all), label); + menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_DELETE, NULL); + gtk_widget_set_sensitive (menuitem, FALSE); gtk_widget_show (menuitem); gtk_menu_shell_append (GTK_MENU_SHELL (label->select_info->popup_menu), menuitem); @@ -3588,10 +3587,10 @@ gtk_label_do_popup (GtkLabel *label, gtk_widget_show (menuitem); gtk_menu_shell_append (GTK_MENU_SHELL (label->select_info->popup_menu), menuitem); - menuitem = gtk_menu_item_new_with_label (_("Input Methods")); + menuitem = gtk_menu_item_new_with_label (_("Select All")); + g_signal_connect_swapped (menuitem, "activate", + G_CALLBACK (gtk_label_select_all), label); gtk_widget_show (menuitem); - gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), gtk_menu_new ()); - gtk_widget_set_sensitive (menuitem, FALSE); gtk_menu_shell_append (GTK_MENU_SHELL (label->select_info->popup_menu), menuitem); g_signal_emit (label,