diff options
| author | Owen Taylor <otaylor@redhat.com> | 1998-12-23 19:16:21 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 1998-12-23 19:16:21 +0000 |
| commit | c6cf882eee09e43268fd48beb91de05cfab63f05 (patch) | |
| tree | 091c07e13db79f70460dc6a931b3d7244b4a142d /gtk/gtkmenu.c | |
| parent | fb833c477b525b395995fdb8ba9cb0e04e543748 (diff) | |
| download | gtk+-c6cf882eee09e43268fd48beb91de05cfab63f05.tar.gz | |
label->label should be the mb text _after_ removing the underlines, not
Wed Dec 23 13:58:14 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtklabel.c (gtk_label_parse_uline):
label->label should be the mb text _after_ removing
the underlines, not before.
* gtk/gtkmenu.c: Reverted Elliot's tearoff-menu-item
title hack. If it deserves being done, it deserves
being done right.
Diffstat (limited to 'gtk/gtkmenu.c')
| -rw-r--r-- | gtk/gtkmenu.c | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c index 368fa0af3b..6008da04e6 100644 --- a/gtk/gtkmenu.c +++ b/gtk/gtkmenu.c @@ -616,23 +616,9 @@ gtk_menu_set_tearoff_state (GtkMenu *menu, GtkWidget *child = GTK_BIN (attach_widget)->child; if (GTK_IS_LABEL (child)) { - gchar *ret, *retdup = NULL, *ctmp; - - ret = gtk_object_get_data(GTK_OBJECT(attach_widget), - "GtkTearoffMenuItem_window_title"); - if(!ret) { - gtk_label_get (GTK_LABEL (child), &ret); - - retdup = ctmp = g_strdup(ret); - - /* Get rid of all the _'s from menu item hotkeys */ - while((ctmp = strchr(ctmp, '_'))) - g_memmove(ctmp, ctmp+1, strlen(ctmp+1)+1); - } - - gdk_window_set_title (menu->tearoff_window->window, - retdup?retdup:ret); - g_free(retdup); + gchar *ret; + gtk_label_get (GTK_LABEL (child), &ret); + gdk_window_set_title (menu->tearoff_window->window, ret); } } |