X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-sheet.c;h=728604d5138db9afdc2ac14d87a09cb1a515fd47;hb=65d602ed236d685ffec00ad1552a193cf47b2e4d;hp=58c9decc66cb82c4fec7f8db5840dcafdebb4518;hpb=f29eb7f4e0e1c07e157633d78c127aedfe79ecdb;p=pspp

diff --git a/src/ui/gui/psppire-data-sheet.c b/src/ui/gui/psppire-data-sheet.c
index 58c9decc66..728604d513 100644
--- a/src/ui/gui/psppire-data-sheet.c
+++ b/src/ui/gui/psppire-data-sheet.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2017, 2019  John Darrington
+   Copyright (C) 2017, 2019, 2020  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
@@ -163,6 +163,10 @@ create_data_row_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 Case"));
 
@@ -273,6 +277,13 @@ psppire_data_sheet_delete_variables (PsppireDataSheet *sheet)
   PsppireDataStore *data_store = NULL;
   g_object_get (sheet, "data-model", &data_store, NULL);
 
+  if (range->start_x > range->end_x)
+    {
+      gint temp = range->start_x;
+      range->start_x = range->end_x;
+      range->end_x = temp;
+    }
+
   psppire_dict_delete_variables (data_store->dict, range->start_x,
 				 (range->end_x - range->start_x + 1));
 
@@ -281,13 +292,15 @@ psppire_data_sheet_delete_variables (PsppireDataSheet *sheet)
   gtk_widget_queue_draw (GTK_WIDGET (sheet));
 }
 
-
-
 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),
@@ -335,25 +348,54 @@ G_DEFINE_TYPE (PsppireDataSheet, psppire_data_sheet, SSW_TYPE_SHEET)
 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)
 {
-  //  PsppireDataSheet *sheet = PSPPIRE_DATA_SHEET (obj);
+  PsppireDataSheet *sheet = PSPPIRE_DATA_SHEET (obj);
 
   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);
 }
 
+
+static void
+psppire_data_sheet_realize (GtkWidget *widget)
+{
+  g_object_set (widget,
+                "forward-conversion", psppire_data_store_value_to_string,
+                "reverse-conversion", psppire_data_store_string_to_value,
+                "editable", TRUE,
+                "horizontal-draggable", TRUE,
+                NULL);
+
+  /* Chain up to the parent class */
+  GTK_WIDGET_CLASS (parent_class)->realize (widget);
+}
+
 static void
 psppire_data_sheet_class_init (PsppireDataSheetClass *class)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (class);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
+
+  widget_class->realize = psppire_data_sheet_realize;
   object_class->dispose = psppire_data_sheet_dispose;
+  object_class->finalize = psppire_data_sheet_finalize;
 
   parent_class = g_type_class_peek_parent (class);
 }
@@ -361,15 +403,7 @@ psppire_data_sheet_class_init (PsppireDataSheetClass *class)
 GtkWidget*
 psppire_data_sheet_new (void)
 {
-  GObject *obj =
-    g_object_new (PSPPIRE_TYPE_DATA_SHEET,
-		  "forward-conversion", psppire_data_store_value_to_string,
-		  "reverse-conversion", psppire_data_store_string_to_value,
-		  "editable", TRUE,
-		  "horizontal-draggable", TRUE,
-		  NULL);
-
-  return GTK_WIDGET (obj);
+  return g_object_new (PSPPIRE_TYPE_DATA_SHEET, NULL);
 }
 
 
@@ -411,15 +445,15 @@ resize_display_width (PsppireDict *dict, gint pos, gint size, gpointer user_data
   PangoContext *context = gtk_widget_create_pango_context (GTK_WIDGET (sheet));
   PangoLayout *layout = pango_layout_new (context);
   PangoRectangle rect;
-  
+
   pango_layout_set_text (layout, "M", 1);
   pango_layout_get_extents (layout, NULL, &rect);
-  
+
   gdouble width_of_M = rect.width / (gdouble) PANGO_SCALE;
-  
+
   g_object_unref (G_OBJECT (layout));
   g_object_unref (G_OBJECT (context));
-  
+
   gint Ms = round ((size / width_of_M) - 0.25);
   struct variable *var = psppire_dict_get_variable (dict, pos);
   g_return_val_if_fail (var, TRUE);
@@ -433,6 +467,8 @@ set_dictionary (PsppireDataSheet *sheet)
   GtkTreeModel *data_model = NULL;
   g_object_get (sheet, "data-model", &data_model, NULL);
 
+  g_return_if_fail (data_model);
+
   PsppireDataStore *store = PSPPIRE_DATA_STORE (data_model);
   g_object_set (sheet, "hmodel", store->dict, NULL);