X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fval-labs-dialog.c;h=6b556d6de7861baa006530b2cfcf943fe0ff46d9;hb=2c043e1bf0d36ae7b3900bf3c2b98196f67d5b7d;hp=bd2cf0b35564d427f3042ddcad8eace1ef24a465;hpb=66ada89a69ed73a1a15abfbd9bffe4cdf9bf307a;p=pspp diff --git a/src/ui/gui/val-labs-dialog.c b/src/ui/gui/val-labs-dialog.c index bd2cf0b355..6b556d6de7 100644 --- a/src/ui/gui/val-labs-dialog.c +++ b/src/ui/gui/val-labs-dialog.c @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2005, 2009, 2010, 2011 Free Software Foundation + Copyright (C) 2005, 2009, 2010, 2011, 2012 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 @@ -22,7 +22,7 @@ #include -#include "helper.h" +#include "builder-wrapper.h" #include "val-labs-dialog.h" #include #include @@ -30,6 +30,8 @@ #include "psppire-var-store.h" #include +#include "helper.h" + #include #define _(msgid) gettext (msgid) #define N_(msgid) msgid @@ -38,9 +40,6 @@ struct val_labs_dialog { GtkWidget *window; - PsppireVarStore *var_store; - PsppireDict *dict; - /* The variable to be updated */ struct variable *pv; @@ -385,7 +384,7 @@ on_select_row (GtkTreeView *treeview, gpointer data) /* Create a new dialog box (there should normally be only one)*/ struct val_labs_dialog * -val_labs_dialog_create (GtkWindow *toplevel, PsppireVarStore *var_store) +val_labs_dialog_create (GtkWindow *toplevel) { GtkTreeViewColumn *column; @@ -395,8 +394,6 @@ val_labs_dialog_create (GtkWindow *toplevel, PsppireVarStore *var_store) struct val_labs_dialog *dialog = g_malloc (sizeof (*dialog)); - dialog->var_store = var_store; - g_object_get (var_store, "dictionary", &dialog->dict, NULL); dialog->window = get_widget_assert (xml,"val_labs_dialog"); dialog->value_entry = get_widget_assert (xml,"value_entry"); dialog->label_entry = get_widget_assert (xml,"label_entry");