PsppSheetViewColumn: Remove GtkArrow

[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..f3aa94f6e5fd02f4081ee89e27ee0c45bd75b926 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
@@ -59,61 +59,62 @@ typedef void (* PsppSheetCellDataFunc) (PsppSheetViewColumn *tree_column,
 
 struct _PsppSheetViewColumn
 {
-  GtkObject parent;
-
-  GtkWidget *GSEAL (tree_view);
-  GtkWidget *GSEAL (button);
-  GtkWidget *GSEAL (child);
-  GtkWidget *GSEAL (arrow);
-  GtkWidget *GSEAL (alignment);
-  GdkWindow *GSEAL (window);
-  GtkCellEditable *GSEAL (editable_widget);
-  gfloat GSEAL (xalign);
-  guint GSEAL (property_changed_signal);
-  gint GSEAL (spacing);
+  GObject parent;
+
+  GtkWidget *PSEAL (tree_view);
+  GtkWidget *PSEAL (button);
+  GtkWidget *PSEAL (child);
+  GtkWidget *PSEAL (alignment);
+  GdkWindow *PSEAL (window);
+  GtkCellEditable *PSEAL (editable_widget);
+  gfloat PSEAL (xalign);
+  guint PSEAL (property_changed_signal);
+  gint PSEAL (spacing);
+  GtkAllocation PSEAL (allocation);
 
   /* Sizing fields */
   /* see gtk+/doc/tree-column-sizing.txt for more information on them */
-  gint GSEAL (requested_width);
-  gint GSEAL (button_request);
-  gint GSEAL (resized_width);
-  gint GSEAL (width);
-  gint GSEAL (fixed_width);
-  gint GSEAL (min_width);
-  gint GSEAL (max_width);
+  gint PSEAL (requested_width);
+  gint PSEAL (button_request);
+  gint PSEAL (resized_width);
+  gint PSEAL (width);
+  gint PSEAL (fixed_width);
+  gint PSEAL (min_width);
+  gint PSEAL (max_width);
 
   /* dragging columns */
-  gint GSEAL (drag_x);
-  gint GSEAL (drag_y);
+  gint PSEAL (drag_x);
+  gint PSEAL (drag_y);
 
-  gchar *GSEAL (title);
-  GList *GSEAL (cell_list);
+  gchar *PSEAL (title);
+  GList *PSEAL (cell_list);
 
   /* Sorting */
-  guint GSEAL (sort_clicked_signal);
-  guint GSEAL (sort_column_changed_signal);
-  gint GSEAL (sort_column_id);
-  GtkSortType GSEAL (sort_order);
+  guint PSEAL (sort_clicked_signal);
+  guint PSEAL (sort_column_changed_signal);
+  gint PSEAL (sort_column_id);
+  GtkSortType PSEAL (sort_order);
 
   /* Flags */
-  guint GSEAL (visible)             : 1;
-  guint GSEAL (resizable)           : 1;
-  guint GSEAL (clickable)           : 1;
-  guint GSEAL (dirty)               : 1;
-  guint GSEAL (show_sort_indicator) : 1;
-  guint GSEAL (maybe_reordered)     : 1;
-  guint GSEAL (reorderable)         : 1;
-  guint GSEAL (use_resized_width)   : 1;
-  guint GSEAL (expand)              : 1;
-  guint GSEAL (quick_edit)          : 1;
-  guint GSEAL (selected)            : 1;
-  guint GSEAL (selectable)          : 1;
-  guint GSEAL (row_head)            : 1;
+  guint PSEAL (visible)             : 1;
+  guint PSEAL (resizable)           : 1;
+  guint PSEAL (clickable)           : 1;
+  guint PSEAL (dirty)               : 1;
+  guint PSEAL (show_sort_indicator) : 1;
+  guint PSEAL (maybe_reordered)     : 1;
+  guint PSEAL (reorderable)         : 1;
+  guint PSEAL (use_resized_width)   : 1;
+  guint PSEAL (expand)              : 1;
+  guint PSEAL (quick_edit)          : 1;
+  guint PSEAL (selected)            : 1;
+  guint PSEAL (selectable)          : 1;
+  guint PSEAL (row_head)            : 1;
+  guint PSEAL (tabbable)            : 1;
 };
 
 struct _PsppSheetViewColumnClass
 {
-  GtkObjectClass parent_class;
+  GObjectClass parent_class;
 
   gboolean (*clicked) (PsppSheetViewColumn *tree_column);
   gboolean (*button_press_event) (PsppSheetViewColumn *,
@@ -138,9 +139,9 @@ void                    pspp_sheet_view_column_pack_end            (PsppSheetVie
                                                                  GtkCellRenderer         *cell,
                                                                  gboolean                 expand);
 void                    pspp_sheet_view_column_clear               (PsppSheetViewColumn       *tree_column);
-#ifndef GTK_DISABLE_DEPRECATED
+
 GList                  *pspp_sheet_view_column_get_cell_renderers  (PsppSheetViewColumn       *tree_column);
-#endif
+
 void                    pspp_sheet_view_column_add_attribute       (PsppSheetViewColumn       *tree_column,
                                                                  GtkCellRenderer         *cell_renderer,
                                                                  const gchar             *attribute,
@@ -182,7 +183,7 @@ void                    pspp_sheet_view_column_clicked             (PsppSheetVie
  */
 void                    pspp_sheet_view_column_set_title           (PsppSheetViewColumn       *tree_column,
                                                                  const gchar             *title);
-G_CONST_RETURN gchar   *pspp_sheet_view_column_get_title           (PsppSheetViewColumn       *tree_column);
+const gchar   *         pspp_sheet_view_column_get_title           (PsppSheetViewColumn       *tree_column);
 void                    pspp_sheet_view_column_set_expand          (PsppSheetViewColumn       *tree_column,
                                                                  gboolean                 expand);
 gboolean                pspp_sheet_view_column_get_expand          (PsppSheetViewColumn       *tree_column);
@@ -212,6 +213,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 +254,12 @@ 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);
 
 G_END_DECLS