X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-editor.c;h=9f014e6b9d6798f228751be0d45b4e1215554d50;hb=5926aad8bf007a6f61ff64b8c9de6b59cde233bc;hp=09729bc42510353fbca895a62ad1a26d7d96b245;hpb=f2d4cc6e7a4d5948a2c0cf70883347000a79a2b0;p=pspp

diff --git a/src/ui/gui/psppire-data-editor.c b/src/ui/gui/psppire-data-editor.c
index 09729bc425..9f014e6b9d 100644
--- a/src/ui/gui/psppire-data-editor.c
+++ b/src/ui/gui/psppire-data-editor.c
@@ -717,7 +717,7 @@ psppire_data_editor_init (PsppireDataEditor *de)
   g_signal_connect (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (de->datum_entry))),
                     "activate", G_CALLBACK (on_datum_entry_activate), de);
 
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_box_pack_start (GTK_BOX (hbox), de->cell_ref_label, FALSE, FALSE, 0);
   gtk_box_pack_start (GTK_BOX (hbox), de->datum_entry, TRUE, TRUE, 0);
 
@@ -725,7 +725,7 @@ psppire_data_editor_init (PsppireDataEditor *de)
   de->datasheet_vbox_widget
     = make_single_datasheet (de, GTK_TREE_VIEW_GRID_LINES_BOTH, FALSE);
 
-  de->vbox = gtk_vbox_new (FALSE, 0);
+  de->vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_box_pack_start (GTK_BOX (de->vbox), hbox, FALSE, FALSE, 0);
   gtk_box_pack_start (GTK_BOX (de->vbox), de->datasheet_vbox_widget,
                       TRUE, TRUE, 0);
@@ -796,12 +796,8 @@ static void
 set_font_recursively (GtkWidget *w, gpointer data)
 {
   PangoFontDescription *font_desc = data;
-  GtkRcStyle *style = gtk_widget_get_modifier_style (w);
 
-  pango_font_description_free (style->font_desc);
-  style->font_desc = pango_font_description_copy (font_desc);
-
-  gtk_widget_modify_style (w, style);
+  gtk_widget_override_font (w, font_desc);
 
   if ( GTK_IS_CONTAINER (w))
     gtk_container_foreach (GTK_CONTAINER (w), set_font_recursively, font_desc);