Imported Upstream version 3.2.0

[glabels] / src / color-combo-button.c

diff --git a/src/color-combo-button.c b/src/color-combo-button.c
index 8a5e988d46524db7de11f9cf941b88048188ade2..11b304c6652d5fafd7a5cfbf90d98d901bb9d48c 100644 (file)
--- a/src/color-combo-button.c
+++ b/src/color-combo-button.c
@@ -138,7 +138,7 @@ gl_color_combo_button_init (glColorComboButton *this)
 
         this->priv = g_new0 (glColorComboButtonPrivate, 1);
 
-        this->priv->button_vbox = gtk_vbox_new (FALSE, 0);
+        this->priv->button_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 
         this->priv->button = gtk_toggle_button_new ();
         gtk_container_add (GTK_CONTAINER (this->priv->button), this->priv->button_vbox);
@@ -339,7 +339,7 @@ menu_position_function (GtkMenu            *menu,
         /*
          * Size of menu.
          */
-        gtk_widget_size_request (this->priv->menu, &menu_requisition);
+        gtk_widget_get_preferred_size (this->priv->menu, NULL, &menu_requisition);
         h_menu = menu_requisition.height;
         w_menu = menu_requisition.width;