diff src/util.c @ 619:faa7603ae02e

[gaim-migrate @ 629] added more pixmaps and modified picture_button() so that they aren't spaced all funny committer: Tailor Script <tailor@pidgin.im>
author Todd Kulesza <fflewddur>
date Sat, 05 Aug 2000 19:22:41 +0000
parents 50f7a0bc76fc
children 83b0caceea9a
line wrap: on
line diff
--- a/src/util.c	Sat Aug 05 17:57:39 2000 +0000
+++ b/src/util.c	Sat Aug 05 19:22:41 2000 +0000
@@ -892,7 +892,7 @@
 GtkWidget *picture_button(GtkWidget *window, char *text, char **xpm)
 {
 	GtkWidget *button;
-	GtkWidget *button_box;
+	GtkWidget *button_box, *button_box_2, *button_box_3;
 	GtkWidget *label;
 	GdkBitmap *mask;
 	GdkPixmap *pm;
@@ -901,20 +901,27 @@
 	button = gtk_button_new();
 	if (display_options & OPT_DISP_COOL_LOOK)
 		gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
-	gtk_widget_show(button);
 
 	button_box = gtk_hbox_new(FALSE, 5);
 	gtk_container_add(GTK_CONTAINER(button), button_box);
-	gtk_widget_show(button_box);
 
+	button_box_2 = gtk_hbox_new(FALSE, 0);
+	button_box_3 = gtk_hbox_new(FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(button_box), button_box_2, TRUE, TRUE, 0);
+	gtk_box_pack_start(GTK_BOX(button_box), button_box_3, TRUE, TRUE, 0);
 	pm = gdk_pixmap_create_from_xpm_d(window->window, &mask, NULL, xpm);
 	pixmap = gtk_pixmap_new(pm, mask);
-	gtk_box_pack_start(GTK_BOX(button_box), pixmap, FALSE, FALSE, 2);
-	gtk_widget_show(pixmap);
+	gtk_box_pack_end(GTK_BOX(button_box_2), pixmap, FALSE, FALSE, 0);
 
 	label = gtk_label_new(text);
-	gtk_box_pack_end(GTK_BOX(button_box), label, FALSE, FALSE, 2);
+	gtk_box_pack_start(GTK_BOX(button_box_3), label, FALSE, FALSE, 2);
+
+	gtk_widget_show(pixmap);
 	gtk_widget_show(label);
-
+	gtk_widget_show(button_box_2);
+	gtk_widget_show(button_box_3);
+	gtk_widget_show(button_box);
+	gtk_widget_show(button);
+		
 	return button;
 }