X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=inline;f=src%2Fui%2Fgui%2Ftext-data-import-dialog.c;h=9a8dc7e2d301a01971f969ab7a75de57aad8aadb;hb=58c762effe6bbe1ee418b57a1f461bbd33173bd2;hp=76c95c41781270bd23ca80e279224af17e4a2d73;hpb=e2da62d735c597afeef2e0e9b36e5a4a83d7da94;p=pspp diff --git a/src/ui/gui/text-data-import-dialog.c b/src/ui/gui/text-data-import-dialog.c index 76c95c4178..9a8dc7e2d3 100644 --- a/src/ui/gui/text-data-import-dialog.c +++ b/src/ui/gui/text-data-import-dialog.c @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation + Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -122,7 +122,7 @@ text_data_import_assistant (PsppireDataWindow *dw) case GTK_RESPONSE_APPLY: { gchar *fn = g_path_get_basename (ia->file.file_name); - open_data_window (PSPPIRE_WINDOW (dw), fn, generate_syntax (ia)); + open_data_window (PSPPIRE_WINDOW (dw), fn, NULL, generate_syntax (ia)); g_free (fn); } break; @@ -575,8 +575,8 @@ get_string_width (PsppSheetView *treeview, GtkCellRenderer *renderer, { gint width; g_object_set (G_OBJECT (renderer), "text", string, (void *) NULL); - gtk_cell_renderer_get_size (renderer, GTK_WIDGET (treeview), - NULL, NULL, NULL, &width, NULL); + gtk_cell_renderer_get_preferred_width (renderer, GTK_WIDGET (treeview), + NULL, &width); return width; }