Remove PSEAL macro. It is no longer useful.

diff --git a/src/ui/gui/include/gtk/gtk.in.h b/src/ui/gui/include/gtk/gtk.in.h
index 18ea7c0692f8ce4f054f668cf24e9df846279c28..29fc7d5a968d28d0aec16cf21607744fd0702b9c 100644 (file)
--- a/src/ui/gui/include/gtk/gtk.in.h
+++ b/src/ui/gui/include/gtk/gtk.in.h
@@ -30,9 +30,6 @@
 #endif
 
 
-/* Like GSEAL but only used in PSPP */
-#define PSEAL(X) X
-
 #if (GTK_CHECK_VERSION(3,8,0) == 0)
 #define gtk_widget_register_window(widget, window) gdk_window_set_user_data (window, widget);
 #endif

diff --git a/src/ui/gui/pspp-sheet-selection.h b/src/ui/gui/pspp-sheet-selection.h
index ded218c8c5ff1c856149d8790afc9444e0a9c3e0..ec96dd117bf620811818bbe991fdb18a0f1e36d7 100644 (file)
--- a/src/ui/gui/pspp-sheet-selection.h
+++ b/src/ui/gui/pspp-sheet-selection.h
@@ -77,8 +77,8 @@ struct _PsppSheetSelection
 
   /*< private >*/
 
-  PsppSheetView *PSEAL (tree_view);
-  PsppSheetSelectionMode PSEAL (type);
+  PsppSheetView *tree_view;
+  PsppSheetSelectionMode type;
 };
 
 struct _PsppSheetSelectionClass

diff --git a/src/ui/gui/pspp-sheet-view-column.h b/src/ui/gui/pspp-sheet-view-column.h
index 65eede214efebe8dee8654968e94d47e6dde371c..75482e9497f86cba2b714238f14ed5585f9a7075 100644 (file)
--- a/src/ui/gui/pspp-sheet-view-column.h
+++ b/src/ui/gui/pspp-sheet-view-column.h
@@ -61,55 +61,55 @@ struct _PsppSheetViewColumn
 {
   GObject parent;
 
-  GtkWidget *PSEAL (tree_view);
-  GtkWidget *PSEAL (button);
-  GtkWidget *PSEAL (child);
-  GtkWidget *PSEAL (bin);
-  GdkWindow *PSEAL (window);
-  GtkCellEditable *PSEAL (editable_widget);
-  GtkAlign PSEAL (halign);
-  guint PSEAL (property_changed_signal);
-  gint PSEAL (spacing);
-  GtkAllocation PSEAL (allocation);
+  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 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);
+  gint requested_width;
+  gint button_request;
+  gint resized_width;
+  gint width;
+  gint fixed_width;
+  gint min_width;
+  gint max_width;
 
   /* dragging columns */
-  gint PSEAL (drag_x);
-  gint PSEAL (drag_y);
+  gint drag_x;
+  gint drag_y;
 
-  gchar *PSEAL (title);
-  GList *PSEAL (cell_list);
+  gchar *title;
+  GList *cell_list;
 
   /* Sorting */
-  guint PSEAL (sort_clicked_signal);
-  guint PSEAL (sort_column_changed_signal);
-  gint PSEAL (sort_column_id);
-  GtkSortType PSEAL (sort_order);
+  guint sort_clicked_signal;
+  guint sort_column_changed_signal;
+  gint sort_column_id;
+  GtkSortType sort_order;
 
   /* Flags */
-  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;
+  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

diff --git a/src/ui/gui/pspp-sheet-view.h b/src/ui/gui/pspp-sheet-view.h
index 8941b8946bd8245d0f7055cf16d0af6f6714ae98..92d7315b8b77e35527b4699a092182cdcae070be 100644 (file)
--- a/src/ui/gui/pspp-sheet-view.h
+++ b/src/ui/gui/pspp-sheet-view.h
@@ -108,7 +108,7 @@ struct _PsppSheetView
 {
   GtkContainer parent;
 
-  PsppSheetViewPrivate *PSEAL (priv);
+  PsppSheetViewPrivate *priv;
 
   gboolean dispose_has_run ;
 };