X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fsplit-file-dialog.c;h=9088046ec29b805c3bfca90158ed5302d747cc4a;hb=a554ee5cd3f34f39bd202f6a40a79256b537c40d;hp=3546f84450b7f0188fb19f9180d5950b90245047;hpb=c81ed3d3c60ca7d576ef9d3d9c9d6863d6f11bf5;p=pspp diff --git a/src/ui/gui/split-file-dialog.c b/src/ui/gui/split-file-dialog.c index 3546f84450..9088046ec2 100644 --- a/src/ui/gui/split-file-dialog.c +++ b/src/ui/gui/split-file-dialog.c @@ -26,6 +26,8 @@ #include "helper.h" #include +#include "psppire-var-view.h" + #include @@ -68,8 +70,7 @@ generate_syntax (const struct split_file_dialog *sfd) GString * varlist = g_string_sized_new (80); GtkWidget *sort = get_widget_assert (sfd->xml, "split-radiobutton3"); GtkWidget *layered = get_widget_assert (sfd->xml, "split-radiobutton1"); - gint n_vars = append_variable_names (varlist, - sfd->dict, GTK_TREE_VIEW (vars), 0); + gint n_vars = psppire_var_view_append_names (PSPPIRE_VAR_VIEW (vars), 0, varlist); if ( n_vars > 0 ) { @@ -163,10 +164,9 @@ refresh (PsppireDialog *dialog, struct split_file_dialog *d) /* Pops up the Split File dialog box */ void -split_file_dialog (GObject *o, gpointer data) +split_file_dialog (PsppireDataWindow *de) { gint response; - PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data); struct split_file_dialog sfd; PsppireVarStore *vs ; @@ -195,12 +195,6 @@ split_file_dialog (GObject *o, gpointer data) g_signal_connect (on_off, "toggled", G_CALLBACK(on_off_toggled), sfd.xml); - set_dest_model (GTK_TREE_VIEW (dest), sfd.dict); - - psppire_selector_set_select_func (PSPPIRE_SELECTOR (selector), - insert_source_row_into_tree_view, - NULL); - g_signal_connect (dialog, "refresh", G_CALLBACK (refresh), &sfd); gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de)); @@ -223,7 +217,7 @@ split_file_dialog (GObject *o, gpointer data) case PSPPIRE_RESPONSE_PASTE: { gchar *syntax = generate_syntax (&sfd); - paste_syntax_in_new_window (syntax); + paste_syntax_to_window (syntax); g_free (syntax); }