X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpspp-sheet-view.c;h=c569d20403c201d967cbe7832349f71452141901;hb=ec9ef1ece2392967ddf17980089bc4692931d6c3;hp=8cf47564ae4e92642360cf869519ba836c4895d2;hpb=2ed64681bb51b288b31054249fe41f61c5eab696;p=pspp

diff --git a/src/ui/gui/pspp-sheet-view.c b/src/ui/gui/pspp-sheet-view.c
index 8cf47564ae..c569d20403 100644
--- a/src/ui/gui/pspp-sheet-view.c
+++ b/src/ui/gui/pspp-sheet-view.c
@@ -1266,7 +1266,6 @@ static void
 pspp_sheet_view_finalize (GObject *object)
 {
   PsppSheetView *tree_view = PSPP_SHEET_VIEW (object);
-  GList *list;
 
   pspp_sheet_view_stop_editing (tree_view, TRUE);
 
@@ -1276,18 +1275,6 @@ pspp_sheet_view_finalize (GObject *object)
       tree_view->priv->selected = NULL;
     }
 
-  if (tree_view->priv->columns != NULL)
-    {
-      list = tree_view->priv->columns;
-      while (list)
-	{
-	  PsppSheetViewColumn *column;
-	  column = PSPP_SHEET_VIEW_COLUMN (list->data);
-	  list = list->next;
-	  pspp_sheet_view_remove_column (tree_view, column);
-	}
-      tree_view->priv->columns = NULL;
-    }
 
   tree_view->priv->prelight_node = -1;
 
@@ -1531,6 +1518,8 @@ pspp_sheet_view_unrealize (GtkWidget *widget)
   PsppSheetViewPrivate *priv = tree_view->priv;
   GList *list;
 
+  GTK_WIDGET_CLASS (pspp_sheet_view_parent_class)->unrealize (widget);
+
   if (priv->scroll_timeout != 0)
     {
       g_source_remove (priv->scroll_timeout);
@@ -1595,7 +1584,18 @@ pspp_sheet_view_unrealize (GtkWidget *widget)
   for (x = 0 ; x < 5 ; ++x)
     g_object_unref (priv->grid_line_gc[x]);
 
-  GTK_WIDGET_CLASS (pspp_sheet_view_parent_class)->unrealize (widget);
+  if (tree_view->priv->columns != NULL)
+    {
+      list = tree_view->priv->columns;
+      while (list)
+	{
+	  PsppSheetViewColumn *column;
+	  column = PSPP_SHEET_VIEW_COLUMN (list->data);
+	  list = list->next;
+	  pspp_sheet_view_remove_column (tree_view, column);
+	}
+      tree_view->priv->columns = NULL;
+    }
 }
 
 /* GtkWidget::size_request helper */
@@ -5360,6 +5360,9 @@ do_presize_handler (PsppSheetView *tree_view)
   validate_visible_area (tree_view);
   tree_view->priv->presize_handler_timer = 0;
 
+  if (! gtk_widget_get_realized (GTK_WIDGET (tree_view)))
+    return FALSE;
+
   gtk_widget_size_request (GTK_WIDGET (tree_view), &requisition);
 
   tree_view->priv->hadjustment->upper = MAX (tree_view->priv->hadjustment->upper, (gfloat)requisition.width);
@@ -9233,7 +9236,8 @@ pspp_sheet_view_remove_column (PsppSheetView       *tree_view,
 	}
 
       if (tree_view->priv->n_columns == 0 &&
-	  pspp_sheet_view_get_headers_visible (tree_view))
+	  pspp_sheet_view_get_headers_visible (tree_view) && 
+	  tree_view->priv->header_window)
 	gdk_window_hide (tree_view->priv->header_window);
 
       gtk_widget_queue_resize (GTK_WIDGET (tree_view));