/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2009 Free Software Foundation
+ Copyright (C) 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
#include <config.h>
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>
#include "psppire-dictview.h"
#include "psppire-dict.h"
#include "psppire-conf.h"
{
PsppireDictView *dict_view = PSPPIRE_DICT_VIEW (object);
- g_object_unref (dict_view->menu);
+ gtk_widget_destroy (dict_view->menu);
}
/* Properties */
{
GtkTreeModel *model ;
- if ( dict_view->predicate )
+ if ( dict_view->dict == NULL)
+ return;
+
+ if ( dict_view->predicate )
{
model = gtk_tree_model_filter_new (GTK_TREE_MODEL (dict_view->dict),
NULL);
else
{
model = GTK_TREE_MODEL (dict_view->dict);
+ g_object_ref (model);
}
gtk_tree_view_set_model (GTK_TREE_VIEW (dict_view), model);
+ g_object_unref (model);
}
static void
struct variable *var;
GtkTreeIter iter;
GtkTreeModel *model;
- PsppireDict *dict;
dv_get_base_model (top_model, top_iter, &model, &iter);
- dict = PSPPIRE_DICT (model);
-
gtk_tree_model_get (model,
&iter, DICT_TVM_COL_VAR, &var, -1);
}
else
{
- const struct fmt_spec *fs = var_get_write_format (var);
+ const struct fmt_spec *fs = var_get_print_format (var);
int cat = fmt_get_category (fs->type);
switch ( var_get_measure (var))
{
{
const gchar *tip ;
GtkTreeModel *m;
- PsppireDict *dict;
dv_get_base_model (tree_model, NULL, &m, NULL);
- dict = PSPPIRE_DICT (m);
if ( PSPPIRE_DICT_VIEW (treeview)->prefer_labels )
tip = var_get_name (var);