From a3ba231fcc2746e664a67c85d88eb49a64813989 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 9 Nov 2010 08:48:33 -0500 Subject: Drop backward-compatibility cruft. --- widgets/table/e-cell-combo.c | 3 --- widgets/table/e-cell-date-edit.c | 3 --- widgets/table/e-cell-popup.c | 3 --- widgets/table/e-cell-text.c | 7 ++----- widgets/table/e-cell-toggle.c | 3 --- widgets/table/e-table-click-to-add.c | 3 --- widgets/table/e-table-field-chooser.c | 3 --- widgets/table/e-table-group-container.c | 3 --- widgets/table/e-table-header-item.c | 3 --- widgets/table/e-table-item.c | 3 --- widgets/table/e-table.c | 3 --- widgets/table/e-tree.c | 3 --- widgets/table/gal-a11y-e-cell-popup.c | 3 --- widgets/table/gal-a11y-e-table.c | 3 --- widgets/table/gal-a11y-e-tree.c | 3 --- 15 files changed, 2 insertions(+), 47 deletions(-) (limited to 'widgets/table') diff --git a/widgets/table/e-cell-combo.c b/widgets/table/e-cell-combo.c index 168061e4e7..a54f6c9c98 100644 --- a/widgets/table/e-cell-combo.c +++ b/widgets/table/e-cell-combo.c @@ -68,9 +68,6 @@ #include "e-cell-combo.h" #include "e-cell-text.h" -/* backward-compatibility cruft */ -#include "e-util/gtk-compat.h" - #define d(x) /* The height to make the popup list if there aren't any items in it. */ diff --git a/widgets/table/e-cell-date-edit.c b/widgets/table/e-cell-date-edit.c index a71d3cc76c..770ac77f0a 100644 --- a/widgets/table/e-cell-date-edit.c +++ b/widgets/table/e-cell-date-edit.c @@ -48,9 +48,6 @@ /* This depends on ECalendar which is why I didn't put it in gal. */ #include -/* backward-compatibility cruft */ -#include "e-util/gtk-compat.h" - static void e_cell_date_edit_get_property (GObject *object, guint property_id, GValue *value, diff --git a/widgets/table/e-cell-popup.c b/widgets/table/e-cell-popup.c index 5e89b6c37d..dfc9526885 100644 --- a/widgets/table/e-cell-popup.c +++ b/widgets/table/e-cell-popup.c @@ -41,9 +41,6 @@ #include "e-table-item.h" #include -/* backward-compatibility cruft */ -#include "e-util/gtk-compat.h" - #define E_CELL_POPUP_ARROW_WIDTH 16 #define E_CELL_POPUP_ARROW_XPAD 3 #define E_CELL_POPUP_ARROW_YPAD 3 diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c index a4160419ae..83338fc1e7 100644 --- a/widgets/table/e-cell-text.c +++ b/widgets/table/e-cell-text.c @@ -56,9 +56,6 @@ #include "e-cell-text.h" #include "e-table-item.h" -/* backward-compatibility cruft */ -#include "e-util/gtk-compat.h" - #define d(x) #define DO_SELECTION 1 #define VIEW_TO_CELL(view) E_CELL_TEXT (((ECellView *)view)->ecell) @@ -770,7 +767,7 @@ ect_draw (ECellView *ecell_view, GdkDrawable *drawable, if (edit && edit->view_col == view_col && edit->row == row) { if (edit->selection_start != edit->selection_end) { - GdkRegion *clip_region; + cairo_region_t *clip_region; gint indices[2]; GtkStateType state; @@ -784,7 +781,7 @@ ect_draw (ECellView *ecell_view, GdkDrawable *drawable, indices, 1); gdk_cairo_region (cr, clip_region); cairo_clip (cr); - gdk_region_destroy (clip_region); + cairo_region_destroy (clip_region); gdk_cairo_set_source_color (cr, &style->base[state]); cairo_paint (cr); diff --git a/widgets/table/e-cell-toggle.c b/widgets/table/e-cell-toggle.c index 8ceca7c966..d988f801ae 100644 --- a/widgets/table/e-cell-toggle.c +++ b/widgets/table/e-cell-toggle.c @@ -38,9 +38,6 @@ #include "e-cell-toggle.h" #include "e-table-item.h" -/* backward-compatibility cruft */ -#include "e-util/gtk-compat.h" - #define E_CELL_TOGGLE_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ ((obj), E_TYPE_CELL_TOGGLE, ECellTogglePrivate)) diff --git a/widgets/table/e-table-click-to-add.c b/widgets/table/e-table-click-to-add.c index d983c1b935..d7a1e7f237 100644 --- a/widgets/table/e-table-click-to-add.c +++ b/widgets/table/e-table-click-to-add.c @@ -39,9 +39,6 @@ #include "e-table-header.h" #include "e-table-one.h" -/* backward-compatibility cruft */ -#include "e-util/gtk-compat.h" - enum { CURSOR_CHANGE, STYLE_SET, diff --git a/widgets/table/e-table-field-chooser.c b/widgets/table/e-table-field-chooser.c index 557785df0c..e038271b86 100644 --- a/widgets/table/e-table-field-chooser.c +++ b/widgets/table/e-table-field-chooser.c @@ -34,9 +34,6 @@ #include "e-table-field-chooser.h" #include "e-table-field-chooser-item.h" -/* backward-compatibility cruft */ -#include "e-util/gtk-compat.h" - static void e_table_field_chooser_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec); static void e_table_field_chooser_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec); static void e_table_field_chooser_dispose (GObject *object); diff --git a/widgets/table/e-table-group-container.c b/widgets/table/e-table-group-container.c index 6e8bbf4e61..f9c12b2a9a 100644 --- a/widgets/table/e-table-group-container.c +++ b/widgets/table/e-table-group-container.c @@ -39,9 +39,6 @@ #include "e-table-item.h" #include "e-table-sorting-utils.h" -/* backward-compatibility cruft */ -#include "e-util/gtk-compat.h" - #define TITLE_HEIGHT 16 /* workaround for avoiding API breakage */ diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c index 2e7b4704ec..284565165d 100644 --- a/widgets/table/e-table-header-item.c +++ b/widgets/table/e-table-header-item.c @@ -50,9 +50,6 @@ #include "arrow-up.xpm" #include "arrow-down.xpm" -/* backward-compatibility cruft */ -#include "e-util/gtk-compat.h" - enum { BUTTON_PRESSED, LAST_SIGNAL diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c index b6421bb439..57d5c80963 100644 --- a/widgets/table/e-table-item.c +++ b/widgets/table/e-table-item.c @@ -48,9 +48,6 @@ #include "e-table-item.h" #include "e-table-subset.h" -/* backward-compatibility cruft */ -#include "e-util/gtk-compat.h" - /* workaround for avoiding API breakage */ #define eti_get_type e_table_item_get_type G_DEFINE_TYPE (ETableItem, eti, GNOME_TYPE_CANVAS_ITEM) diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c index aad7c9f729..d21137ef04 100644 --- a/widgets/table/e-table.c +++ b/widgets/table/e-table.c @@ -52,9 +52,6 @@ #include "e-table-subset.h" #include "e-table-utils.h" -/* backward-compatibility cruft */ -#include "e-util/gtk-compat.h" - #define COLUMN_HEADER_HEIGHT 16 #define d(x) diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c index bcad41a797..39bfd40d6c 100644 --- a/widgets/table/e-tree.c +++ b/widgets/table/e-tree.c @@ -52,9 +52,6 @@ #include "e-tree.h" #include "e-tree-table-adapter.h" -/* backward-compatibility cruft */ -#include "e-util/gtk-compat.h" - #define COLUMN_HEADER_HEIGHT 16 #define d(x) diff --git a/widgets/table/gal-a11y-e-cell-popup.c b/widgets/table/gal-a11y-e-cell-popup.c index a282f862e3..89894ab99d 100644 --- a/widgets/table/gal-a11y-e-cell-popup.c +++ b/widgets/table/gal-a11y-e-cell-popup.c @@ -32,9 +32,6 @@ #include "gal-a11y-e-cell-popup.h" #include "gal-a11y-e-cell-registry.h" -/* backward-compatibility cruft */ -#include "e-util/gtk-compat.h" - static AtkObjectClass *parent_class = NULL; #define PARENT_TYPE (gal_a11y_e_cell_get_type ()) diff --git a/widgets/table/gal-a11y-e-table.c b/widgets/table/gal-a11y-e-table.c index 7139b41fe3..c6ba4e7d2b 100644 --- a/widgets/table/gal-a11y-e-table.c +++ b/widgets/table/gal-a11y-e-table.c @@ -33,9 +33,6 @@ #include "gal-a11y-e-table-factory.h" #include "gal-a11y-e-table-item.h" -/* backward-compatibility cruft */ -#include "e-util/gtk-compat.h" - #define CS_CLASS(a11y) (G_TYPE_INSTANCE_GET_CLASS ((a11y), C_TYPE_STREAM, GalA11yETableClass)) static AtkObjectClass *parent_class; static GType parent_type; diff --git a/widgets/table/gal-a11y-e-tree.c b/widgets/table/gal-a11y-e-tree.c index 193d3eb9d7..d474f96af5 100644 --- a/widgets/table/gal-a11y-e-tree.c +++ b/widgets/table/gal-a11y-e-tree.c @@ -30,9 +30,6 @@ #include "gal-a11y-e-tree.h" #include "gal-a11y-e-tree-factory.h" -/* backward-compatibility cruft */ -#include "e-util/gtk-compat.h" - #define CS_CLASS(a11y) (G_TYPE_INSTANCE_GET_CLASS ((a11y), C_TYPE_STREAM, GalA11yETreeClass)) static AtkObjectClass *parent_class; static GType parent_type; -- cgit v1.2.3