From fd3196d9ed831cf61d28270973c359fdd67835d7 Mon Sep 17 00:00:00 2001 From: Anders Carlsson Date: Tue, 23 Oct 2001 22:43:01 +0000 Subject: [PATCH] Use an image menu item here (popup_targets_received): Call 2001-10-24 Anders Carlsson * gtk/gtkentry.c: (append_action_signal): Use an image menu item here (popup_targets_received): Call append_action_signal with stock items * gtk/gtklabel.c: (append_action_signal): Use an image menu item here (gtk_label_do_popup): Call append_action_signal with stock items * gtk/gtktextview.c: (append_action_signal): Use an image menu item here (popup_targets_received): Call append_action_signal with stock items --- ChangeLog | 11 +++++++++++ ChangeLog.pre-2-0 | 11 +++++++++++ ChangeLog.pre-2-10 | 11 +++++++++++ ChangeLog.pre-2-2 | 11 +++++++++++ ChangeLog.pre-2-4 | 11 +++++++++++ ChangeLog.pre-2-6 | 11 +++++++++++ ChangeLog.pre-2-8 | 11 +++++++++++ gtk/gtkentry.c | 12 +++++++----- gtk/gtklabel.c | 12 +++++++----- gtk/gtktextview.c | 12 +++++++----- 10 files changed, 98 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index a7710e4b37..b6cd8b6d27 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2001-10-24 Anders Carlsson + + * gtk/gtkentry.c: (append_action_signal): Use an image menu item here + (popup_targets_received): Call append_action_signal with stock items + + * gtk/gtklabel.c: (append_action_signal): Use an image menu item here + (gtk_label_do_popup): Call append_action_signal with stock items + + * gtk/gtktextview.c: (append_action_signal): Use an image menu item here + (popup_targets_received): Call append_action_signal with stock items + 2001-10-23 Havoc Pennington * gtk/gtktextview.c (changed_handler): queue a resize here; will diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index a7710e4b37..b6cd8b6d27 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,14 @@ +2001-10-24 Anders Carlsson + + * gtk/gtkentry.c: (append_action_signal): Use an image menu item here + (popup_targets_received): Call append_action_signal with stock items + + * gtk/gtklabel.c: (append_action_signal): Use an image menu item here + (gtk_label_do_popup): Call append_action_signal with stock items + + * gtk/gtktextview.c: (append_action_signal): Use an image menu item here + (popup_targets_received): Call append_action_signal with stock items + 2001-10-23 Havoc Pennington * gtk/gtktextview.c (changed_handler): queue a resize here; will diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index a7710e4b37..b6cd8b6d27 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,14 @@ +2001-10-24 Anders Carlsson + + * gtk/gtkentry.c: (append_action_signal): Use an image menu item here + (popup_targets_received): Call append_action_signal with stock items + + * gtk/gtklabel.c: (append_action_signal): Use an image menu item here + (gtk_label_do_popup): Call append_action_signal with stock items + + * gtk/gtktextview.c: (append_action_signal): Use an image menu item here + (popup_targets_received): Call append_action_signal with stock items + 2001-10-23 Havoc Pennington * gtk/gtktextview.c (changed_handler): queue a resize here; will diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index a7710e4b37..b6cd8b6d27 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,14 @@ +2001-10-24 Anders Carlsson + + * gtk/gtkentry.c: (append_action_signal): Use an image menu item here + (popup_targets_received): Call append_action_signal with stock items + + * gtk/gtklabel.c: (append_action_signal): Use an image menu item here + (gtk_label_do_popup): Call append_action_signal with stock items + + * gtk/gtktextview.c: (append_action_signal): Use an image menu item here + (popup_targets_received): Call append_action_signal with stock items + 2001-10-23 Havoc Pennington * gtk/gtktextview.c (changed_handler): queue a resize here; will diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index a7710e4b37..b6cd8b6d27 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,14 @@ +2001-10-24 Anders Carlsson + + * gtk/gtkentry.c: (append_action_signal): Use an image menu item here + (popup_targets_received): Call append_action_signal with stock items + + * gtk/gtklabel.c: (append_action_signal): Use an image menu item here + (gtk_label_do_popup): Call append_action_signal with stock items + + * gtk/gtktextview.c: (append_action_signal): Use an image menu item here + (popup_targets_received): Call append_action_signal with stock items + 2001-10-23 Havoc Pennington * gtk/gtktextview.c (changed_handler): queue a resize here; will diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index a7710e4b37..b6cd8b6d27 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,14 @@ +2001-10-24 Anders Carlsson + + * gtk/gtkentry.c: (append_action_signal): Use an image menu item here + (popup_targets_received): Call append_action_signal with stock items + + * gtk/gtklabel.c: (append_action_signal): Use an image menu item here + (gtk_label_do_popup): Call append_action_signal with stock items + + * gtk/gtktextview.c: (append_action_signal): Use an image menu item here + (popup_targets_received): Call append_action_signal with stock items + 2001-10-23 Havoc Pennington * gtk/gtktextview.c (changed_handler): queue a resize here; will diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index a7710e4b37..b6cd8b6d27 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,14 @@ +2001-10-24 Anders Carlsson + + * gtk/gtkentry.c: (append_action_signal): Use an image menu item here + (popup_targets_received): Call append_action_signal with stock items + + * gtk/gtklabel.c: (append_action_signal): Use an image menu item here + (gtk_label_do_popup): Call append_action_signal with stock items + + * gtk/gtktextview.c: (append_action_signal): Use an image menu item here + (popup_targets_received): Call append_action_signal with stock items + 2001-10-23 Havoc Pennington * gtk/gtktextview.c (changed_handler): queue a resize here; will diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c index d12ccf4afd..d2426f08e1 100644 --- a/gtk/gtkentry.c +++ b/gtk/gtkentry.c @@ -34,6 +34,7 @@ #include "gtkclipboard.h" #include "gtkdnd.h" #include "gtkentry.h" +#include "gtkimagemenuitem.h" #include "gtkimmulticontext.h" #include "gtkintl.h" #include "gtkmain.h" @@ -42,6 +43,7 @@ #include "gtkseparatormenuitem.h" #include "gtkselection.h" #include "gtksettings.h" +#include "gtkstock.h" #include "gtksignal.h" #include "gtkwindow.h" @@ -3701,11 +3703,11 @@ gtk_entry_mnemonic_activate (GtkWidget *widget, static void append_action_signal (GtkEntry *entry, GtkWidget *menu, - const gchar *label, + const gchar *stock_id, const gchar *signal, gboolean sensitive) { - GtkWidget *menuitem = gtk_menu_item_new_with_label (label); + GtkWidget *menuitem = gtk_image_menu_item_new_from_stock (stock_id, NULL); gtk_object_set_data (GTK_OBJECT (menuitem), "gtk-signal", (char *)signal); gtk_signal_connect (GTK_OBJECT (menuitem), "activate", @@ -3781,11 +3783,11 @@ popup_targets_received (GtkClipboard *clipboard, GTK_WIDGET (entry), popup_menu_detach); - append_action_signal (entry, entry->popup_menu, _("Cut"), "cut_clipboard", + append_action_signal (entry, entry->popup_menu, GTK_STOCK_CUT, "cut_clipboard", entry->editable && entry->current_pos != entry->selection_bound); - append_action_signal (entry, entry->popup_menu, _("Copy"), "copy_clipboard", + append_action_signal (entry, entry->popup_menu, GTK_STOCK_COPY, "copy_clipboard", entry->current_pos != entry->selection_bound); - append_action_signal (entry, entry->popup_menu, _("Paste"), "paste_clipboard", + append_action_signal (entry, entry->popup_menu, GTK_STOCK_PASTE, "paste_clipboard", entry->editable && clipboard_contains_text); menuitem = gtk_menu_item_new_with_label (_("Select All")); diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index b682a8a954..a76f88da98 100644 --- a/gtk/gtklabel.c +++ b/gtk/gtklabel.c @@ -33,10 +33,12 @@ #include "gtkclipboard.h" #include "gdk/gdki18n.h" #include +#include "gtkimagemenuitem.h" #include "gtkintl.h" #include "gtkseparatormenuitem.h" #include "gtkmenuitem.h" #include "gtknotebook.h" +#include "gtkstock.h" #include "gtkbindings.h" struct _GtkLabelSelectionInfo @@ -3087,11 +3089,11 @@ activate_cb (GtkWidget *menuitem, static void append_action_signal (GtkLabel *label, GtkWidget *menu, - const gchar *label_text, + const gchar *stock_id, const gchar *signal, gboolean sensitive) { - GtkWidget *menuitem = gtk_menu_item_new_with_label (label_text); + GtkWidget *menuitem = gtk_image_menu_item_new_from_stock (stock_id, NULL); gtk_object_set_data (GTK_OBJECT (menuitem), "gtk-signal", (char *)signal); gtk_signal_connect (GTK_OBJECT (menuitem), "activate", @@ -3168,11 +3170,11 @@ gtk_label_do_popup (GtkLabel *label, label->select_info->selection_anchor != label->select_info->selection_end; - append_action_signal (label, label->select_info->popup_menu, _("Cut"), "cut_clipboard", + append_action_signal (label, label->select_info->popup_menu, GTK_STOCK_CUT, "cut_clipboard", FALSE); - append_action_signal (label, label->select_info->popup_menu, _("Copy"), "copy_clipboard", + append_action_signal (label, label->select_info->popup_menu, GTK_STOCK_COPY, "copy_clipboard", have_selection); - append_action_signal (label, label->select_info->popup_menu, _("Paste"), "paste_clipboard", + append_action_signal (label, label->select_info->popup_menu, GTK_STOCK_PASTE, "paste_clipboard", FALSE); menuitem = gtk_menu_item_new_with_label (_("Select All")); diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c index 6cbe53c5c8..2e33971f48 100644 --- a/gtk/gtktextview.c +++ b/gtk/gtktextview.c @@ -29,6 +29,7 @@ #define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API #include "gtkbindings.h" #include "gtkdnd.h" +#include "gtkimagemenuitem.h" #include "gtkintl.h" #include "gtkmain.h" #include "gtkmenu.h" @@ -36,6 +37,7 @@ #include "gtkseparatormenuitem.h" #include "gtksettings.h" #include "gtksignal.h" +#include "gtkstock.h" #include "gtktextdisplay.h" #include "gtktextview.h" #include "gtkimmulticontext.h" @@ -5354,11 +5356,11 @@ activate_cb (GtkWidget *menuitem, static void append_action_signal (GtkTextView *text_view, GtkWidget *menu, - const gchar *label, + const gchar *stock_id, const gchar *signal, gboolean sensitive) { - GtkWidget *menuitem = gtk_menu_item_new_with_label (label); + GtkWidget *menuitem = gtk_image_menu_item_new_from_stock (stock_id, NULL); g_object_set_data (G_OBJECT (menuitem), "gtk-signal", (char *)signal); gtk_signal_connect (GTK_OBJECT (menuitem), "activate", @@ -5485,11 +5487,11 @@ popup_targets_received (GtkClipboard *clipboard, can_insert = gtk_text_iter_can_insert (&iter, text_view->editable); - append_action_signal (text_view, text_view->popup_menu, _("Cut"), "cut_clipboard", + append_action_signal (text_view, text_view->popup_menu, GTK_STOCK_CUT, "cut_clipboard", have_selection); - append_action_signal (text_view, text_view->popup_menu, _("Copy"), "copy_clipboard", + append_action_signal (text_view, text_view->popup_menu, GTK_STOCK_COPY, "copy_clipboard", have_selection); - append_action_signal (text_view, text_view->popup_menu, _("Paste"), "paste_clipboard", + append_action_signal (text_view, text_view->popup_menu, GTK_STOCK_PASTE, "paste_clipboard", can_insert && clipboard_contains_text); menuitem = gtk_separator_menu_item_new ();