src/output/cairo.c (xr_chart_renderer): Set the chart size to 0.8 of the smallest...

[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 f18fee1d104e2d6b0ddb57c26c6de2870a1ba0e0..75482e9497f86cba2b714238f14ed5585f9a7075 100644 (file)
--- a/src/ui/gui/pspp-sheet-view-column.h
+++ b/src/ui/gui/pspp-sheet-view-column.h
@@ -59,64 +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);
-  GtkAllocation GSEAL (allocation);
+  GObject parent;
+
+  GtkWidget *tree_view;
+  GtkWidget *button;
+  GtkWidget *child;
+  GtkWidget *bin;
+  GdkWindow *window;
+  GtkCellEditable *editable_widget;
+  GtkAlign halign;
+  guint property_changed_signal;
+  gint spacing;
+  GtkAllocation 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 requested_width;
+  gint button_request;
+  gint resized_width;
+  gint width;
+  gint fixed_width;
+  gint min_width;
+  gint max_width;
 
   /* dragging columns */
-  gint GSEAL (drag_x);
-  gint GSEAL (drag_y);
+  gint drag_x;
+  gint drag_y;
 
-  gchar *GSEAL (title);
-  GList *GSEAL (cell_list);
+  gchar *title;
+  GList *cell_list;
 
   /* Sorting */
-  guint GSEAL (sort_clicked_signal);
-  guint GSEAL (sort_column_changed_signal);
-  gint GSEAL (sort_column_id);
-  GtkSortType GSEAL (sort_order);
+  guint sort_clicked_signal;
+  guint sort_column_changed_signal;
+  gint sort_column_id;
+  GtkSortType 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 GSEAL (tabbable)            : 1;
-  guint GSEAL (need_button)         : 1;
+  guint visible             : 1;
+  guint resizable           : 1;
+  guint clickable           : 1;
+  guint dirty               : 1;
+  guint show_sort_indicator : 1;
+  guint maybe_reordered     : 1;
+  guint reorderable         : 1;
+  guint use_resized_width   : 1;
+  guint expand              : 1;
+  guint quick_edit          : 1;
+  guint selected            : 1;
+  guint selectable          : 1;
+  guint row_head            : 1;
+  guint tabbable            : 1;
 };
 
 struct _PsppSheetViewColumnClass
 {
-  GtkObjectClass parent_class;
+  GObjectClass parent_class;
 
   gboolean (*clicked) (PsppSheetViewColumn *tree_column);
   gboolean (*button_press_event) (PsppSheetViewColumn *,
@@ -141,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,
@@ -185,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);
@@ -195,9 +193,9 @@ gboolean                pspp_sheet_view_column_get_clickable       (PsppSheetVie
 void                    pspp_sheet_view_column_set_widget          (PsppSheetViewColumn       *tree_column,
                                                                  GtkWidget               *widget);
 GtkWidget              *pspp_sheet_view_column_get_widget          (PsppSheetViewColumn       *tree_column);
-void                    pspp_sheet_view_column_set_alignment       (PsppSheetViewColumn       *tree_column,
-                                                                 gfloat                   xalign);
-gfloat                  pspp_sheet_view_column_get_alignment       (PsppSheetViewColumn       *tree_column);
+void                    pspp_sheet_view_column_set_alignment       (PsppSheetViewColumn       *tree_columna,
+                                                                 GtkAlign                   xalign);
+GtkAlign                  pspp_sheet_view_column_get_alignment       (PsppSheetViewColumn       *tree_column);
 void                    pspp_sheet_view_column_set_reorderable     (PsppSheetViewColumn       *tree_column,
                                                                  gboolean                 reorderable);
 gboolean                pspp_sheet_view_column_get_reorderable     (PsppSheetViewColumn       *tree_column);
@@ -262,8 +260,6 @@ void                    pspp_sheet_view_column_size_request       (PsppSheetView
 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