projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change gpointer variable to PsppireDataWindow * in dialog function signatures
[pspp]
/
src
/
ui
/
gui
/
variable-info-dialog.c
diff --git
a/src/ui/gui/variable-info-dialog.c
b/src/ui/gui/variable-info-dialog.c
index 2fdf2df87440ce8beec883aa65aab02dce988123..fa4343a931299d5396785a4858b1526e18ba7152 100644
(file)
--- a/
src/ui/gui/variable-info-dialog.c
+++ b/
src/ui/gui/variable-info-dialog.c
@@
-17,6
+17,7
@@
#include <config.h>
#include <gtk/gtk.h>
#include <config.h>
#include <gtk/gtk.h>
+#include "variable-info-dialog.h"
#include "var-display.h"
#include <data/variable.h>
#include <data/format.h>
#include "var-display.h"
#include <data/variable.h>
#include <data/format.h>
@@
-65,7
+66,7
@@
populate_text (PsppireDictView *treeview, gpointer data)
if ( var == NULL)
return;
if ( var == NULL)
return;
- g_object_get (treeview, "
dictionary
", &dict,
+ g_object_get (treeview, "
model
", &dict,
NULL);
gstring = g_string_sized_new (200);
NULL);
gstring = g_string_sized_new (200);
@@
-91,8
+92,6
@@
populate_text (PsppireDictView *treeview, gpointer data)
text = measure_to_string (var, NULL);
g_string_append_printf (gstring, _("Measurement Level: %s\n"),
text);
text = measure_to_string (var, NULL);
g_string_append_printf (gstring, _("Measurement Level: %s\n"),
text);
- g_free (text);
-
/* Value Labels */
/* Value Labels */
@@
-145,13
+144,11
@@
static gchar * generate_syntax (PsppireDictView *treeview);
void
void
-variable_info_dialog (
GObject *o, gpointer data
)
+variable_info_dialog (
PsppireDataWindow *de
)
{
{
- PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data);
-
gint response ;
gint response ;
- GtkBuilder *xml = builder_new ("variable-info
-dialog
.ui");
+ GtkBuilder *xml = builder_new ("variable-info.ui");
GtkWidget *dialog = get_widget_assert (xml, "variable-info-dialog");
GtkWidget *treeview = get_widget_assert (xml, "treeview2");
GtkWidget *dialog = get_widget_assert (xml, "variable-info-dialog");
GtkWidget *treeview = get_widget_assert (xml, "treeview2");
@@
-165,7
+162,7
@@
variable_info_dialog (GObject *o, gpointer data)
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de));
g_object_get (vs, "dictionary", &dict, NULL);
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de));
g_object_get (vs, "dictionary", &dict, NULL);
- g_object_set (treeview, "
dictionary
", dict,
+ g_object_set (treeview, "
model
", dict,
"selection-mode", GTK_SELECTION_SINGLE,
NULL);
"selection-mode", GTK_SELECTION_SINGLE,
NULL);