X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dict.c;h=bc31022a5d7056876007cb9b95a6f1fa1e2fa48a;hb=5aee303c40fc10d689756324133ed46de4fe62fa;hp=c82395f2ebdc047e1f8678b9e9d6873df2452207;hpb=729b96a6bd9342c45e6f65a113fd87c70da85b0a;p=pspp
diff --git a/src/ui/gui/psppire-dict.c b/src/ui/gui/psppire-dict.c
index c82395f2eb..bc31022a5d 100644
--- a/src/ui/gui/psppire-dict.c
+++ b/src/ui/gui/psppire-dict.c
@@ -15,22 +15,22 @@
along with this program. If not, see . */
#include
+
+#include "ui/gui/psppire-dict.h"
+
#include
#include
-
#include
-#include
-
-#include "psppire-dict.h"
-#include
-#include
-#include
-#include
-#include
-
-#include "helper.h"
-#include "message-dialog.h"
+#include "data/dictionary.h"
+#include "data/missing-values.h"
+#include "data/value-labels.h"
+#include "data/variable.h"
+#include "libpspp/i18n.h"
+#include "libpspp/message.h"
+#include "ui/gui/helper.h"
+#include "ui/gui/psppire-marshal.h"
+#include "ui/gui/psppire-var-ptr.h"
enum {
BACKEND_CHANGED,
@@ -648,7 +648,7 @@ tree_model_column_type (GtkTreeModel *model, gint index)
return G_TYPE_STRING;
break;
case DICT_TVM_COL_VAR:
- return G_TYPE_POINTER;
+ return PSPPIRE_VAR_PTR_TYPE;
break;
default:
g_return_val_if_reached ((GType)0);
@@ -765,8 +765,8 @@ tree_model_get_value (GtkTreeModel *model, GtkTreeIter *iter,
}
break;
case DICT_TVM_COL_VAR:
- g_value_init (value, G_TYPE_POINTER);
- g_value_set_pointer (value, var);
+ g_value_init (value, PSPPIRE_VAR_PTR_TYPE);
+ g_value_set_boxed (value, var);
break;
default:
g_return_if_reached ();