Imported Upstream version 3.2.0

[glabels] / src / font-combo.c

diff --git a/src/font-combo.c b/src/font-combo.c
index 3c9480f5965a69c05decd378b87f041aa0b4cb2d..cf24d9de0702cd462abff328049064f30904aa4f 100644 (file)
--- a/src/font-combo.c
+++ b/src/font-combo.c
@@ -118,7 +118,7 @@ gl_font_combo_init (glFontCombo *this)
 
         this->priv = g_new0 (glFontComboPrivate, 1);
 
-        hbox = gtk_hbox_new (FALSE, 3);
+        hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
         gtk_container_add (GTK_CONTAINER (this), hbox);
         
         this->priv->label = gtk_label_new ("");
@@ -258,7 +258,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;