summaryrefslogtreecommitdiff
path: root/gtk/gtklabel.c
diff options
context:
space:
mode:
authorAnders Carlsson <andersca@gnu.org>2001-10-23 22:43:01 +0000
committerAnders Carlsson <andersca@src.gnome.org>2001-10-23 22:43:01 +0000
commitfd3196d9ed831cf61d28270973c359fdd67835d7 (patch)
treebd6a68727752caf46718754ea387932ffe548f2d /gtk/gtklabel.c
parentb6ba7a5f0450fb68ee95415dfaf2d746551c5d00 (diff)
downloadgtk+-fd3196d9ed831cf61d28270973c359fdd67835d7.tar.gz
Use an image menu item here (popup_targets_received): Call
2001-10-24 Anders Carlsson <andersca@gnu.org> * 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
Diffstat (limited to 'gtk/gtklabel.c')
-rw-r--r--gtk/gtklabel.c12
1 files changed, 7 insertions, 5 deletions
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 <pango/pango.h>
+#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"));