Merge 'master' into 'psppsheet'.

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

diff --git a/src/ui/gui/pspp-sheet-view-column.h b/src/ui/gui/pspp-sheet-view-column.h
index 8e4df86b4db821dc94c538249e33470a8f37d9a1..f18fee1d104e2d6b0ddb57c26c6de2870a1ba0e0 100644 (file)
--- a/src/ui/gui/pspp-sheet-view-column.h
+++ b/src/ui/gui/pspp-sheet-view-column.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
@@ -71,6 +71,7 @@ struct _PsppSheetViewColumn
   gfloat GSEAL (xalign);
   guint GSEAL (property_changed_signal);
   gint GSEAL (spacing);
+  GtkAllocation GSEAL (allocation);
 
   /* Sizing fields */
   /* see gtk+/doc/tree-column-sizing.txt for more information on them */
@@ -109,6 +110,8 @@ struct _PsppSheetViewColumn
   guint GSEAL (selected)            : 1;
   guint GSEAL (selectable)          : 1;
   guint GSEAL (row_head)            : 1;
+  guint GSEAL (tabbable)            : 1;
+  guint GSEAL (need_button)         : 1;
 };
 
 struct _PsppSheetViewColumnClass
@@ -212,6 +215,9 @@ gboolean                pspp_sheet_view_column_get_selectable     (PsppSheetView
 void                    pspp_sheet_view_column_set_row_head     (PsppSheetViewColumn       *tree_column,
                                                                  gboolean                 row_head);
 gboolean                pspp_sheet_view_column_get_row_head     (PsppSheetViewColumn       *tree_column);
+void                    pspp_sheet_view_column_set_tabbable     (PsppSheetViewColumn       *tree_column,
+                                                                 gboolean                 tabbable);
+gboolean                pspp_sheet_view_column_get_tabbable     (PsppSheetViewColumn       *tree_column);
 
 
 
@@ -250,6 +256,14 @@ gboolean                pspp_sheet_view_column_cell_get_position   (PsppSheetVie
 void                    pspp_sheet_view_column_queue_resize        (PsppSheetViewColumn       *tree_column);
 GtkWidget              *pspp_sheet_view_column_get_tree_view       (PsppSheetViewColumn       *tree_column);
 
+void                    pspp_sheet_view_column_size_request       (PsppSheetViewColumn       *tree_column,
+                                                                    GtkRequisition             *requisition);
+
+void                    pspp_sheet_view_column_size_allocate       (PsppSheetViewColumn       *tree_column,
+                                                                    GtkAllocation             *allocation);
+gboolean                pspp_sheet_view_column_can_focus           (PsppSheetViewColumn       *tree_column);
+void                    pspp_sheet_view_column_set_need_button     (PsppSheetViewColumn       *tree_column,
+                                                                    gboolean                   need_button);
 
 G_END_DECLS