Mercurial > pidgin.yaz
diff src/util.c @ 754:bcae3ff49680
[gaim-migrate @ 764]
You can now optionally tell gaim to display text in the convo window buttons.
committer: Tailor Script <tailor@pidgin.im>
| author | Rob Flynn <gaim@robflynn.com> |
|---|---|
| date | Thu, 24 Aug 2000 17:37:25 +0000 |
| parents | 012bf218a655 |
| children | 9389216aae29 |
line wrap: on
line diff
--- a/src/util.c Thu Aug 24 01:05:26 2000 +0000 +++ b/src/util.c Thu Aug 24 17:37:25 2000 +0000 @@ -936,13 +936,14 @@ return button; } -GtkWidget *picture_button2(GtkWidget *window, char *text, char **xpm) +GtkWidget *picture_button2(GtkWidget *window, char *text, char **xpm, short showtext) { GtkWidget *button; GtkWidget *button_box, *button_box_2; GdkBitmap *mask; GdkPixmap *pm; GtkWidget *pixmap; + GtkWidget *label; GtkTooltips *tips; tips = gtk_tooltips_new(); @@ -953,12 +954,19 @@ button_box = gtk_hbox_new(FALSE, 0); gtk_container_add(GTK_CONTAINER(button), button_box); - button_box_2 = gtk_hbox_new(FALSE, 0); + button_box_2 = gtk_vbox_new(FALSE, 0); gtk_box_pack_start(GTK_BOX(button_box), button_box_2, TRUE, TRUE, 0); pm = gdk_pixmap_create_from_xpm_d(window->window, &mask, NULL, xpm); pixmap = gtk_pixmap_new(pm, mask); - gtk_box_pack_end(GTK_BOX(button_box_2), pixmap, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(button_box_2), pixmap, FALSE, FALSE, 0); + + if (showtext == TRUE) + { + label = gtk_label_new(text); + gtk_widget_show(label); + gtk_box_pack_end(GTK_BOX(button_box_2), label, FALSE, FALSE, 0); + } gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);