projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 'master' into 'psppsheet'.
[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 3993b8cf440f13451a4f566c0460349664053407..80e15ccf13d91f8c276e5f638111aec4de46ef3a 100644
(file)
--- a/
src/ui/gui/pspp-sheet-private.h
+++ b/
src/ui/gui/pspp-sheet-private.h
@@
-157,6
+157,7
@@
struct _PsppSheetViewPrivate
/* Cell Editing */
PsppSheetViewColumn *edited_column;
/* Cell Editing */
PsppSheetViewColumn *edited_column;
+ gint edited_row;
/* Selection information */
PsppSheetSelection *selection;
/* Selection information */
PsppSheetSelection *selection;
@@
-186,10
+187,6
@@
struct _PsppSheetViewPrivate
/* Non-interactive Header Resizing, expand flag support */
gint prev_width;
/* 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;
/* ATK Hack */
PsppSheetDestroyCountFunc destroy_count_func;
gpointer destroy_count_data;
@@
-219,6
+216,7
@@
struct _PsppSheetViewPrivate
/* fixed height */
gint fixed_height;
/* fixed height */
gint fixed_height;
+ gboolean fixed_height_set;
/* Scroll-to functionality when unrealized */
GtkTreeRowReference *scroll_to_path;
/* Scroll-to functionality when unrealized */
GtkTreeRowReference *scroll_to_path;
@@
-242,7
+240,7
@@
struct _PsppSheetViewPrivate
/* Grid and tree lines */
PsppSheetViewGridLines grid_lines;
/* Grid and tree lines */
PsppSheetViewGridLines grid_lines;
- GdkGC *grid_line_gc;
+ GdkGC *grid_line_gc
[5]
;
/* Special cells. */
PsppSheetViewSpecialCells special_cells;
/* Special cells. */
PsppSheetViewSpecialCells special_cells;