Replaced some obsolete GTK symbols with the recommended modern ones

[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 4e640e418fc0ac5212858460c0750631656cc017..c30d1d0124a5e14ce700fd152da70e5be8eb61f7 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
@@ -40,7 +40,6 @@
 
 G_BEGIN_DECLS
 
-
 #define PSPP_TYPE_SHEET_VIEW_COLUMN         (pspp_sheet_view_column_get_type ())
 #define PSPP_SHEET_VIEW_COLUMN(obj)         (G_TYPE_CHECK_INSTANCE_CAST ((obj), PSPP_TYPE_SHEET_VIEW_COLUMN, PsppSheetViewColumn))
 #define PSPP_SHEET_VIEW_COLUMN_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), PSPP_TYPE_SHEET_VIEW_COLUMN, PsppSheetViewColumnClass))
@@ -72,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 */
@@ -106,13 +106,21 @@ struct _PsppSheetViewColumn
   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 GSEAL (tabbable)            : 1;
+  guint GSEAL (need_button)         : 1;
 };
 
 struct _PsppSheetViewColumnClass
 {
   GtkObjectClass parent_class;
 
-  void (*clicked) (PsppSheetViewColumn *tree_column);
+  gboolean (*clicked) (PsppSheetViewColumn *tree_column);
+  gboolean (*button_press_event) (PsppSheetViewColumn *,
+                                  GdkEventButton *);
 
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
@@ -177,7 +185,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);
@@ -194,6 +202,23 @@ void                    pspp_sheet_view_column_set_reorderable     (PsppSheetVie
                                                                  gboolean                 reorderable);
 gboolean                pspp_sheet_view_column_get_reorderable     (PsppSheetViewColumn       *tree_column);
 
+void                    pspp_sheet_view_column_set_quick_edit     (PsppSheetViewColumn       *tree_column,
+                                                                 gboolean                 quick_edit);
+gboolean                pspp_sheet_view_column_get_quick_edit     (PsppSheetViewColumn       *tree_column);
+void                    pspp_sheet_view_column_set_selected     (PsppSheetViewColumn       *tree_column,
+                                                                 gboolean                 selected);
+gboolean                pspp_sheet_view_column_get_selected     (PsppSheetViewColumn       *tree_column);
+
+void                    pspp_sheet_view_column_set_selectable     (PsppSheetViewColumn       *tree_column,
+                                                                 gboolean                 selectable);
+gboolean                pspp_sheet_view_column_get_selectable     (PsppSheetViewColumn       *tree_column);
+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);
+
 
 
 /* You probably only want to use pspp_sheet_view_column_set_sort_column_id.  The
@@ -231,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