gui: Redo var sheet, data sheet, text import with PsppSheetView.

[pspp] / src / ui / gui / pspp-sheet-private.h

diff --git a/src/ui/gui/pspp-sheet-private.h b/src/ui/gui/pspp-sheet-private.h
index 9d99cbd8a5f7af2060d1ac901af37f4e957f09c8..0cbd812d9ddc40abc1117dd32f576565044db289 100644 (file)
--- a/src/ui/gui/pspp-sheet-private.h
+++ b/src/ui/gui/pspp-sheet-private.h
@@ -1,5 +1,5 @@
  /* PSPPIRE - a graphical user interface for PSPP.
-    Copyright (C) 2011 Free Software Foundation, Inc.
+    Copyright (C) 2011, 2012 Free Software Foundation, Inc.
 
     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
@@ -144,6 +144,7 @@ struct _PsppSheetViewPrivate
   gint pressed_button;
   gint press_start_x;
   gint press_start_y;
+  gint press_start_node;
 
   gint event_last_x;
   gint event_last_y;
@@ -156,6 +157,7 @@ struct _PsppSheetViewPrivate
 
   /* Cell Editing */
   PsppSheetViewColumn *edited_column;
+  gint edited_row;
 
   /* Selection information */
   PsppSheetSelection *selection;
@@ -185,10 +187,6 @@ struct _PsppSheetViewPrivate
   /* Non-interactive Header Resizing, expand flag support */
   gint prev_width;
 
-  gint last_extra_space;
-  gint last_extra_space_per_column;
-  gint last_number_of_expand_columns;
-
   /* ATK Hack */
   PsppSheetDestroyCountFunc destroy_count_func;
   gpointer destroy_count_data;
@@ -218,6 +216,7 @@ struct _PsppSheetViewPrivate
 
   /* fixed height */
   gint fixed_height;
+  gboolean fixed_height_set;
 
   /* Scroll-to functionality when unrealized */
   GtkTreeRowReference *scroll_to_path;
@@ -243,9 +242,15 @@ struct _PsppSheetViewPrivate
   PsppSheetViewGridLines grid_lines;
   GdkGC *grid_line_gc;
 
+  /* Special cells. */
+  PsppSheetViewSpecialCells special_cells;
+
   /* Tooltip support */
   gint tooltip_column;
 
+  /* Cached style for button facades in columns. */
+  GtkStyle *button_style;
+
   /* Here comes the bitfield */
   guint scroll_to_use_align : 1;