projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
PsppireKeypad: Remove gdkkeysyms-compat.h
[pspp]
/
src
/
ui
/
gui
/
psppire-var-sheet.c
diff --git
a/src/ui/gui/psppire-var-sheet.c
b/src/ui/gui/psppire-var-sheet.c
index a06db0b7cd0556ed0d1a3c58a9ab5ae4081aea33..66a95deeed2ad4831cd712d6b016600fcbe6f38a 100644
(file)
--- a/
src/ui/gui/psppire-var-sheet.c
+++ b/
src/ui/gui/psppire-var-sheet.c
@@
-195,7
+195,7
@@
on_var_column_edited (GtkCellRendererText *cell,
{
gtk_widget_queue_resize (GTK_WIDGET (var_sheet));
var_sheet->scroll_to_bottom_signal =
{
gtk_widget_queue_resize (GTK_WIDGET (var_sheet));
var_sheet->scroll_to_bottom_signal =
- g_signal_connect (var_sheet, "size-
request
",
+ g_signal_connect (var_sheet, "size-
allocate
",
G_CALLBACK (scroll_to_bottom), NULL);
}
}
G_CALLBACK (scroll_to_bottom), NULL);
}
}
@@
-588,8
+588,9
@@
get_string_width (PsppSheetView *treeview, GtkCellRenderer *renderer,
g_object_set (G_OBJECT (renderer),
PSPPIRE_IS_CELL_RENDERER_BUTTON (renderer) ? "label" : "text",
string, (void *) NULL);
g_object_set (G_OBJECT (renderer),
PSPPIRE_IS_CELL_RENDERER_BUTTON (renderer) ? "label" : "text",
string, (void *) NULL);
- gtk_cell_renderer_get_size (renderer, GTK_WIDGET (treeview),
- NULL, NULL, NULL, &width, NULL);
+
+ gtk_cell_renderer_get_preferred_width (renderer, GTK_WIDGET (treeview), NULL, &width);
+
return width;
}
return width;
}
@@
-1113,6
+1114,9
@@
psppire_var_sheet_dispose (GObject *obj)
g_object_unref (var_sheet->var_type_dialog);
*/
g_object_unref (var_sheet->var_type_dialog);
*/
+ g_object_unref (var_sheet->builder);
+
+
G_OBJECT_CLASS (psppire_var_sheet_parent_class)->dispose (obj);
}
G_OBJECT_CLASS (psppire_var_sheet_parent_class)->dispose (obj);
}