projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update remaining gtk_paint_focus calls to Gtk3 signature
[pspp]
/
src
/
ui
/
gui
/
psppire-dictview.c
diff --git
a/src/ui/gui/psppire-dictview.c
b/src/ui/gui/psppire-dictview.c
index cab7436cb226f3f287f5e84a69a68589a0c75ffd..5554eb0adebf9cbd8ea9a701461e3f7c72eed9b2 100644
(file)
--- a/
src/ui/gui/psppire-dictview.c
+++ b/
src/ui/gui/psppire-dictview.c
@@
-1,5
+1,5
@@
/* PSPPIRE - a graphical user interface for PSPP.
/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2009, 2010 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
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
@@
-68,7
+68,7
@@
psppire_dict_view_finalize (GObject *object)
{
PsppireDictView *dict_view = PSPPIRE_DICT_VIEW (object);
{
PsppireDictView *dict_view = PSPPIRE_DICT_VIEW (object);
- g
_object_unref
(dict_view->menu);
+ g
tk_widget_destroy
(dict_view->menu);
}
/* Properties */
}
/* Properties */
@@
-105,7
+105,10
@@
set_model (PsppireDictView *dict_view)
{
GtkTreeModel *model ;
{
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);
{
model = gtk_tree_model_filter_new (GTK_TREE_MODEL (dict_view->dict),
NULL);
@@
-118,9
+121,11
@@
set_model (PsppireDictView *dict_view)
else
{
model = GTK_TREE_MODEL (dict_view->dict);
else
{
model = GTK_TREE_MODEL (dict_view->dict);
+ g_object_ref (model);
}
gtk_tree_view_set_model (GTK_TREE_VIEW (dict_view), model);
}
gtk_tree_view_set_model (GTK_TREE_VIEW (dict_view), model);
+ g_object_unref (model);
}
static void
}
static void
@@
-300,12
+305,9
@@
var_description_cell_data_func (GtkTreeViewColumn *col,
struct variable *var;
GtkTreeIter iter;
GtkTreeModel *model;
struct variable *var;
GtkTreeIter iter;
GtkTreeModel *model;
- PsppireDict *dict;
dv_get_base_model (top_model, top_iter, &model, &iter);
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);
gtk_tree_model_get (model,
&iter, DICT_TVM_COL_VAR, &var, -1);
@@
-344,7
+346,7
@@
var_icon_cell_data_func (GtkTreeViewColumn *col,
}
else
{
}
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))
{
int cat = fmt_get_category (fs->type);
switch ( var_get_measure (var))
{
@@
-409,10
+411,8
@@
set_tooltip_for_variable (GtkTreeView *treeview,
{
const gchar *tip ;
GtkTreeModel *m;
{
const gchar *tip ;
GtkTreeModel *m;
- PsppireDict *dict;
dv_get_base_model (tree_model, NULL, &m, NULL);
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);
if ( PSPPIRE_DICT_VIEW (treeview)->prefer_labels )
tip = var_get_name (var);