pspp-sheet-view: Rename GtkTreeSelectMode to PsppSheetSelectMode.

[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 c964c5280613c9c31ca80c3ac9c5314aa5700953..89e246dadc6917e66a887d5e38a8b3a3e3aa2dba 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, 2013 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
@@ -55,10 +55,10 @@ typedef enum
 
 typedef enum
 {
-  GTK_TREE_SELECT_MODE_TOGGLE = 1 << 0,
-  GTK_TREE_SELECT_MODE_EXTEND = 1 << 1
+  PSPP_SHEET_SELECT_MODE_TOGGLE = 1 << 0,
+  PSPP_SHEET_SELECT_MODE_EXTEND = 1 << 1
 }
-GtkTreeSelectMode;
+PsppSheetSelectMode;
 
 enum
 {
@@ -157,6 +157,7 @@ struct _PsppSheetViewPrivate
 
   /* Cell Editing */
   PsppSheetViewColumn *edited_column;
+  gint edited_row;
 
   /* Selection information */
   PsppSheetSelection *selection;
@@ -186,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;
@@ -219,6 +216,7 @@ struct _PsppSheetViewPrivate
 
   /* fixed height */
   gint fixed_height;
+  gboolean fixed_height_set;
 
   /* Scroll-to functionality when unrealized */
   GtkTreeRowReference *scroll_to_path;
@@ -242,7 +240,7 @@ struct _PsppSheetViewPrivate
 
   /* Grid and tree lines */
   PsppSheetViewGridLines grid_lines;
-  GdkGC *grid_line_gc;
+  GdkGC *grid_line_gc[5];
 
   /* Special cells. */
   PsppSheetViewSpecialCells special_cells;
@@ -250,6 +248,9 @@ struct _PsppSheetViewPrivate
   /* 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;
 
@@ -361,7 +362,7 @@ struct _PsppSheetViewPrivate
 void         _pspp_sheet_selection_internal_select_node (PsppSheetSelection  *selection,
                                                       int                node,
                                                       GtkTreePath       *path,
-                                                       GtkTreeSelectMode  mode,
+                                                       PsppSheetSelectMode  mode,
                                                       gboolean           override_browse_mode);
 void         _pspp_sheet_selection_emit_changed         (PsppSheetSelection  *selection);
 void         _pspp_sheet_view_find_node                 (PsppSheetView       *tree_view,