[Gaim-commits] CVS: gaim/src dialogs.c,1.322,1.323

[Jim S. <jse...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv25347/src

Modified Files:
	dialogs.c 
Log Message:
Tie pixmaps and text labels together so when windows are expanded
vertically they stay together--the labels and pixmaps, that is.  (Thanks,
Daniel Walls)


Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.322
retrieving revision 1.323
diff -u -d -r1.322 -r1.323
--- dialogs.c	17 Jun 2002 00:10:34 -0000	1.322
+++ dialogs.c	18 Jun 2002 00:35:23 -0000	1.323
@@ -4288,23 +4288,60 @@
 	button_box_2 = gtk_vbox_new(FALSE, 0);
 
 	gtk_box_pack_start(GTK_BOX(button_box), button_box_2, TRUE, TRUE, 0);
+
 	gtk_widget_show(button_box_2);
 	gtk_widget_show(button_box);
-	if (dispstyle == 2 || dispstyle == 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_2), pixmap, FALSE, FALSE, 0);
+	
+	switch(dispstyle) {
+		case 0:
+			/* Display just pixmap */
+			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_2), pixmap, FALSE, FALSE, 0);
+			
+			gtk_widget_show(pixmap);
+			
+			gdk_pixmap_unref(pm);
+			gdk_bitmap_unref(mask);
+			break;
 
-		gtk_widget_show(pixmap);
+		case 1:
+			/* Display just label */
+			label = gtk_label_new(text);
+			gtk_widget_show(label);
+			gtk_box_pack_start(GTK_BOX(button_box_2), label, FALSE, FALSE, 0);
+			break;
 
-		gdk_pixmap_unref(pm);
-		gdk_bitmap_unref(mask);
-	}
+		case 2:
+			/* Display pixmap and label */
+			{
+				GtkWidget *button_box_top = gtk_vbox_new(FALSE, 0);
+				GtkWidget *button_box_bottom = gtk_vbox_new(FALSE, 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_top), pixmap, FALSE, FALSE, 0);
 
-	if (dispstyle == 2 || dispstyle == 1) {
-		label = gtk_label_new(text);
-		gtk_widget_show(label);
-		gtk_box_pack_end(GTK_BOX(button_box_2), label, FALSE, FALSE, 0);
+				gtk_widget_show(pixmap);
+
+				gdk_pixmap_unref(pm);
+				gdk_bitmap_unref(mask);
+
+				label = gtk_label_new(text);
+				gtk_widget_show(label);
+				gtk_box_pack_start(GTK_BOX(button_box_bottom), label, FALSE, FALSE, 0);
+						
+				gtk_box_pack_start(GTK_BOX(button_box_2), button_box_top, TRUE,
+							TRUE, 0);
+				gtk_box_pack_start(GTK_BOX(button_box_2), button_box_bottom, TRUE,
+							TRUE, 0);
+				gtk_widget_show(button_box_top);
+				gtk_widget_show(button_box_bottom);
+			}
+			break;
+
+		default:
+			break;
 	}
 
 	gtk_tooltips_set_tip(button_tips, button, text, "Gaim");