Fix for bug #252814

svn path=/trunk/; revision=32170

3 files changed, 75 insertions, 4 deletions

diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
index 3655f14352..1699117f56 100644
--- a/widgets/misc/ChangeLog
+++ b/widgets/misc/ChangeLog
@@ -1,3 +1,13 @@
+2006-06-19  Srinivasa Ragavan  <sragavan@novell.com>
+
+	** Fixes bug #252814
+	Committing a patch from Oswald.
+
+	* e-combo-button.c: (e_combo_button_init),
+	(e_combo_button_pack_hbox), (e_combo_button_pack_vbox):
+	* e-combo-button.h: Adds new packing support for supporting toolbar
+	options.
+
 2006-06-19  Chpe <chpe@gnome.org>
 
 	* e-combo-button.c: (paint): Fix for bug #262210
diff --git a/widgets/misc/e-combo-button.c b/widgets/misc/e-combo-button.c
index 53dded883a..1986c594fc 100644
--- a/widgets/misc/e-combo-button.c
+++ b/widgets/misc/e-combo-button.c
@@ -30,6 +30,7 @@
 
 #include <gtk/gtkarrow.h>
 #include <gtk/gtkhbox.h>
+#include <gtk/gtkvbox.h>
 #include <gtk/gtklabel.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtkimage.h>
@@ -42,10 +43,12 @@ struct _EComboButtonPrivate {
 	GtkWidget *label;
 	GtkWidget *arrow_image;
 	GtkWidget *hbox;
+	GtkWidget *vbox;
 
 	GtkMenu *menu;
 
 	gboolean menu_popped_up;
+	gboolean is_already_packed;
 };
 
 #define SPACING 2
@@ -437,6 +440,23 @@ e_combo_button_init (EComboButton *combo_button)
 
 	priv = g_new (EComboButtonPrivate, 1);
 	combo_button->priv = priv;
+	
+	priv->icon              = NULL;
+	priv->menu              = NULL;
+	priv->menu_popped_up    = FALSE;
+	priv->is_already_packed = FALSE;
+}
+
+void
+e_combo_button_pack_hbox (EComboButton *combo_button)
+{
+	EComboButtonPrivate *priv;
+	
+	priv = combo_button->priv;
+
+	if(priv->is_already_packed){
+		gtk_widget_destroy (priv->hbox);
+	}
 
 	priv->hbox = gtk_hbox_new (FALSE, SPACING);
 	gtk_container_add (GTK_CONTAINER (combo_button), priv->hbox);
@@ -448,17 +468,56 @@ e_combo_button_init (EComboButton *combo_button)
 
 	priv->label = gtk_label_new ("");
 	gtk_box_pack_start (GTK_BOX (priv->hbox), priv->label, TRUE, TRUE,
-			    2 * GTK_WIDGET (combo_button)->style->xthickness);
+			    0);
 	gtk_widget_show (priv->label);
 
 	priv->arrow_image = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE);
 	gtk_box_pack_end (GTK_BOX (priv->hbox), priv->arrow_image, TRUE, TRUE,
 			  GTK_WIDGET (combo_button)->style->xthickness);
 	gtk_widget_show (priv->arrow_image);
+	
+	gtk_widget_show (priv->hbox);
+	
+	priv->is_already_packed = TRUE;
+}
 
-	priv->icon           = NULL;
-	priv->menu           = NULL;
-	priv->menu_popped_up = FALSE;
+void
+e_combo_button_pack_vbox (EComboButton *combo_button)
+{
+	EComboButtonPrivate *priv;
+	
+	priv = combo_button->priv;
+	
+	if(priv->is_already_packed){
+		gtk_widget_destroy (priv->hbox);
+	}
+
+	priv->hbox = gtk_hbox_new (FALSE, SPACING);
+	gtk_container_add (GTK_CONTAINER (combo_button), priv->hbox);
+	gtk_widget_show (priv->hbox);
+
+   	priv->vbox = gtk_vbox_new (FALSE, 0);
+	gtk_widget_show (priv->vbox);
+	
+	priv->icon_image = e_icon_factory_get_image (NULL, E_ICON_SIZE_MENU);
+	gtk_box_pack_start (GTK_BOX (priv->vbox), priv->icon_image, TRUE, TRUE, 0);
+	gtk_widget_show (priv->icon_image);
+
+	priv->label = gtk_label_new ("");
+	gtk_box_pack_start (GTK_BOX (priv->vbox), priv->label, TRUE, TRUE,
+			    0);
+	gtk_widget_show (priv->label);
+
+	gtk_box_pack_start (GTK_BOX(priv->hbox),priv->vbox, TRUE, TRUE, 0);
+	
+	priv->arrow_image = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE);
+	gtk_box_pack_end (GTK_BOX (priv->hbox), priv->arrow_image, TRUE, TRUE,
+			  GTK_WIDGET (combo_button)->style->xthickness);
+	gtk_widget_show (priv->arrow_image);
+	
+	gtk_widget_show (priv->hbox);
+	
+	priv->is_already_packed = TRUE;
 }
 
 
diff --git a/widgets/misc/e-combo-button.h b/widgets/misc/e-combo-button.h
index f7d5b878de..dac02c035f 100644
--- a/widgets/misc/e-combo-button.h
+++ b/widgets/misc/e-combo-button.h
@@ -72,6 +72,8 @@ void       e_combo_button_set_label  (EComboButton *combo_button,
 				      const char   *label);
 void       e_combo_button_set_menu   (EComboButton *combo_button,
 				      GtkMenu      *menu);
+void       e_combo_button_pack_vbox  (EComboButton *combo_button);
+void       e_combo_button_pack_hbox  (EComboButton *combo_button);
 
 GtkWidget *e_combo_button_get_label  (EComboButton *combo_button);