Merge 'master' into 'psppsheet'.

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

diff --git a/src/ui/gui/pspp-sheet-view.h b/src/ui/gui/pspp-sheet-view.h
index a80b5452b4ab8622b527f43ab5a6162b1543a6fe..dc9bf681593a3104313b6172bdafd08928ec75bf 100644 (file)
--- a/src/ui/gui/pspp-sheet-view.h
+++ b/src/ui/gui/pspp-sheet-view.h
@@ -102,6 +102,8 @@ struct _PsppSheetView
   GtkContainer parent;
 
   PsppSheetViewPrivate *GSEAL (priv);
+
+  gboolean dispose_has_run ;
 };
 
 struct _PsppSheetViewClass
@@ -391,6 +393,9 @@ PsppSheetViewSpecialCells pspp_sheet_view_get_special_cells (PsppSheetView
 void                        pspp_sheet_view_set_special_cells (PsppSheetView                *tree_view,
                                                                PsppSheetViewSpecialCells);
 
+int           pspp_sheet_view_get_fixed_height (const PsppSheetView *);
+void          pspp_sheet_view_set_fixed_height (PsppSheetView *,
+                                                int fixed_height);
 
 /* Convenience functions for setting tooltips */
 void          pspp_sheet_view_set_tooltip_row    (PsppSheetView       *tree_view,