From f359ee16bbcbb42f48ebaccc8517d253faf78dfd Mon Sep 17 00:00:00 2001 From: Christopher James Lahey Date: Tue, 23 Oct 2001 08:58:19 +0000 Subject: Got rid of the gc field here and just use the fg_gc from the style for 2001-10-23 Christopher James Lahey * e-table-header-item.c, e-table-header-item.h: Got rid of the gc field here and just use the fg_gc from the style for drawing the buttons. svn path=/trunk/; revision=13936 --- widgets/table/e-table-header-item.c | 12 ++---------- widgets/table/e-table-header-item.h | 1 - 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c index 90b2f1de9b..cca78c3709 100644 --- a/widgets/table/e-table-header-item.c +++ b/widgets/table/e-table-header-item.c @@ -715,7 +715,6 @@ ethi_realize (GnomeCanvasItem *item) { ETableHeaderItem *ethi = E_TABLE_HEADER_ITEM (item); GdkWindow *window; - GdkColor c; GtkTargetEntry ethi_drop_types [] = { { TARGET_ETABLE_COL_TYPE, 0, TARGET_ETABLE_COL_HEADER }, }; @@ -726,10 +725,6 @@ ethi_realize (GnomeCanvasItem *item) window = GTK_WIDGET (item->canvas)->window; - ethi->gc = gdk_gc_new (window); - gnome_canvas_get_color (item->canvas, "black", &c); - gdk_gc_set_foreground (ethi->gc, &c); - if (!ethi->font) ethi_font_set (ethi, GTK_WIDGET (item->canvas)->style->font); @@ -765,9 +760,6 @@ ethi_unrealize (GnomeCanvasItem *item) { ETableHeaderItem *ethi = E_TABLE_HEADER_ITEM (item); - gdk_gc_unref (ethi->gc); - ethi->gc = NULL; - gtk_signal_disconnect (GTK_OBJECT (item->canvas), ethi->drag_motion_id); gtk_signal_disconnect (GTK_OBJECT (item->canvas), ethi->drag_leave_id); gtk_signal_disconnect (GTK_OBJECT (item->canvas), ethi->drag_drop_id); @@ -841,7 +833,7 @@ ethi_draw (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int width e_table_header_draw_button (drawable, ecol, GTK_WIDGET (canvas)->style, ethi->font, GTK_WIDGET_STATE (canvas), - GTK_WIDGET (canvas), ethi->gc, + GTK_WIDGET (canvas), GTK_WIDGET (canvas)->style->fg_gc[GTK_STATE_NORMAL], x1 - x, -y, width, height, x2 - x1, ethi->height, @@ -1033,7 +1025,7 @@ ethi_start_drag (ETableHeaderItem *ethi, GdkEvent *event) pixmap, ecol, widget->style, ethi->font, GTK_WIDGET_STATE (widget), - widget, ethi->gc, + widget, widget->style->fg_gc[GTK_STATE_NORMAL], 0, 0, col_width, ethi->height, col_width, ethi->height, diff --git a/widgets/table/e-table-header-item.h b/widgets/table/e-table-header-item.h index 0555585986..6f8783c1ec 100644 --- a/widgets/table/e-table-header-item.h +++ b/widgets/table/e-table-header-item.h @@ -21,7 +21,6 @@ typedef struct { GnomeCanvasItem parent; ETableHeader *eth; - GdkGC *gc; GdkCursor *change_cursor; short height, width; -- cgit