X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fui%2Fgui%2Fsplit-file-dialog.c;h=063f186263f77370da93d956f1e6f759fb7d762f;hb=df83cf8a655317445e3237457658bd827282f970;hp=c44d5591cd9c08e20f88cd2bd90bf63658c09318;hpb=4c4f035bfad520dc54f0d5a9e30e36d4fb009efc;p=pspp-builds.git diff --git a/src/ui/gui/split-file-dialog.c b/src/ui/gui/split-file-dialog.c index c44d5591..063f1862 100644 --- a/src/ui/gui/split-file-dialog.c +++ b/src/ui/gui/split-file-dialog.c @@ -27,7 +27,6 @@ #include #include -#include #include "dialog-common.h" @@ -39,7 +38,7 @@ struct split_file_dialog { /* The XML that created the dialog */ - GladeXML *xml; + GtkBuilder *xml; /* The dictionary to which this dialog pertains */ PsppireDict *dict; @@ -109,7 +108,7 @@ static void on_off_toggled (GtkToggleButton *togglebutton, gpointer user_data) { - GladeXML *xml = user_data; + GtkBuilder *xml = user_data; GtkWidget *dest = get_widget_assert (xml, "split-file-grouping-vars"); GtkWidget *selector = get_widget_assert (xml, "split-file-selector"); GtkWidget *source = get_widget_assert (xml, "split-file-dict-treeview"); @@ -177,7 +176,7 @@ split_file_dialog (GObject *o, gpointer data) GtkWidget *selector ; GtkWidget *on_off ; - sfd.xml = XML_NEW ("psppire.glade"); + sfd.xml = builder_new ("psppire.ui"); dialog = get_widget_assert (sfd.xml, "split-file-dialog"); source = get_widget_assert (sfd.xml, "split-file-dict-treeview"); @@ -192,9 +191,8 @@ split_file_dialog (GObject *o, gpointer data) sfd.selector = PSPPIRE_SELECTOR ( get_widget_assert (sfd.xml, "split-file-selector")); - attach_dictionary_to_treeview (GTK_TREE_VIEW (source), - vs->dict, - GTK_SELECTION_MULTIPLE, NULL); + g_object_set (source, "dictionary", + vs->dict, NULL); g_signal_connect (on_off, "toggled", G_CALLBACK(on_off_toggled), sfd.xml);