projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Autorecode Dialog: Use correct dictionary pointer
[pspp]
/
src
/
ui
/
gui
/
psppire-data-sheet.c
diff --git
a/src/ui/gui/psppire-data-sheet.c
b/src/ui/gui/psppire-data-sheet.c
index 83bc892e15ceadcb54346de4d037ac81c1bb86bc..a842f36aef8dcf4c36002b3077c856c5d2f2c454 100644
(file)
--- a/
src/ui/gui/psppire-data-sheet.c
+++ b/
src/ui/gui/psppire-data-sheet.c
@@
-163,6
+163,10
@@
create_data_row_header_popup_menu (PsppireDataSheet *sheet)
{
GtkWidget *menu = gtk_menu_new ();
{
GtkWidget *menu = gtk_menu_new ();
+ /* gtk_menu_shell_append does not sink/ref this object,
+ so we must do it ourselves (and remember to unref it). */
+ g_object_ref_sink (menu);
+
GtkWidget *item =
gtk_menu_item_new_with_mnemonic (_("_Insert Case"));
GtkWidget *item =
gtk_menu_item_new_with_mnemonic (_("_Insert Case"));
@@
-288,13
+292,15
@@
psppire_data_sheet_delete_variables (PsppireDataSheet *sheet)
gtk_widget_queue_draw (GTK_WIDGET (sheet));
}
gtk_widget_queue_draw (GTK_WIDGET (sheet));
}
-
-
static GtkWidget *
create_data_column_header_popup_menu (PsppireDataSheet *sheet)
{
GtkWidget *menu = gtk_menu_new ();
static GtkWidget *
create_data_column_header_popup_menu (PsppireDataSheet *sheet)
{
GtkWidget *menu = gtk_menu_new ();
+ /* gtk_menu_shell_append does not sink/ref this object,
+ so we must do it ourselves (and remember to unref it). */
+ g_object_ref_sink (menu);
+
GtkWidget *item =
gtk_menu_item_new_with_mnemonic (_("_Insert Variable"));
g_signal_connect_swapped (item, "activate", G_CALLBACK (insert_new_variable),
GtkWidget *item =
gtk_menu_item_new_with_mnemonic (_("_Insert Variable"));
g_signal_connect_swapped (item, "activate", G_CALLBACK (insert_new_variable),
@@
-342,16
+348,26
@@
G_DEFINE_TYPE (PsppireDataSheet, psppire_data_sheet, SSW_TYPE_SHEET)
static GObjectClass * parent_class = NULL;
static gboolean dispose_has_run = FALSE;
static GObjectClass * parent_class = NULL;
static gboolean dispose_has_run = FALSE;
+static void
+psppire_data_sheet_finalize (GObject *obj)
+{
+ /* Chain up to the parent class */
+ G_OBJECT_CLASS (parent_class)->finalize (obj);
+}
+
static void
psppire_data_sheet_dispose (GObject *obj)
{
static void
psppire_data_sheet_dispose (GObject *obj)
{
-
//
PsppireDataSheet *sheet = PSPPIRE_DATA_SHEET (obj);
+ PsppireDataSheet *sheet = PSPPIRE_DATA_SHEET (obj);
if (dispose_has_run)
return;
dispose_has_run = TRUE;
if (dispose_has_run)
return;
dispose_has_run = TRUE;
+ g_object_unref (sheet->data_sheet_cases_column_popup);
+ g_object_unref (sheet->data_sheet_cases_row_popup);
+
/* Chain up to the parent class */
G_OBJECT_CLASS (parent_class)->dispose (obj);
}
/* Chain up to the parent class */
G_OBJECT_CLASS (parent_class)->dispose (obj);
}
@@
-361,6
+377,7
@@
psppire_data_sheet_class_init (PsppireDataSheetClass *class)
{
GObjectClass *object_class = G_OBJECT_CLASS (class);
object_class->dispose = psppire_data_sheet_dispose;
{
GObjectClass *object_class = G_OBJECT_CLASS (class);
object_class->dispose = psppire_data_sheet_dispose;
+ object_class->finalize = psppire_data_sheet_finalize;
parent_class = g_type_class_peek_parent (class);
}
parent_class = g_type_class_peek_parent (class);
}