aboutsummaryrefslogtreecommitdiffstats
path: root/widgets
diff options
context:
space:
mode:
Diffstat (limited to 'widgets')
-rw-r--r--widgets/table/e-table-field-chooser-item.c7
-rw-r--r--widgets/table/e-table-header-item.c10
2 files changed, 13 insertions, 4 deletions
diff --git a/widgets/table/e-table-field-chooser-item.c b/widgets/table/e-table-field-chooser-item.c
index f38cb3964a..69f1fe85dc 100644
--- a/widgets/table/e-table-field-chooser-item.c
+++ b/widgets/table/e-table-field-chooser-item.c
@@ -463,7 +463,7 @@ etfci_draw (GnomeCanvasItem *item, GdkDrawable *drawable, gint x, gint y, gint w
rows = e_table_header_count (etfci->combined_header);
style = GTK_WIDGET (canvas)->style;
- state = GTK_WIDGET_STATE (canvas);
+ state = gtk_widget_get_state (GTK_WIDGET (canvas));
y1 = y2 = 0;
for (row = 0; row < rows; row++, y1 = y2) {
@@ -519,6 +519,7 @@ etfci_start_drag (ETableFieldChooserItem *etfci, GdkEvent *event, gdouble x, gdo
GtkWidget *widget = GTK_WIDGET (GNOME_CANVAS_ITEM (etfci)->canvas);
GtkTargetList *list;
GdkDragContext *context;
+ GtkStateType state;
ETableCol *ecol;
GdkPixmap *pixmap;
gint drag_col;
@@ -552,8 +553,10 @@ etfci_start_drag (ETableFieldChooserItem *etfci, GdkEvent *event, gdouble x, gdo
button_height = e_table_header_compute_height (ecol, widget);
pixmap = gdk_pixmap_new (widget->window, etfci->width, button_height, -1);
+ state = gtk_widget_get_state (widget);
+
e_table_header_draw_button (pixmap, ecol,
- widget->style, GTK_WIDGET_STATE (widget),
+ widget->style, state,
widget,
0, 0,
etfci->width, button_height,
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index 7c75b58963..b2bcb591f8 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -1000,6 +1000,7 @@ ethi_draw (GnomeCanvasItem *item,
x2 += ethi->group_indent_width;
for (col = 0; col < cols; col++, x1 = x2) {
ETableCol *ecol = e_table_header_get_column (ethi->eth, col);
+ GtkStateType state;
gint col_width;
col_width = ecol->width;
@@ -1015,9 +1016,11 @@ ethi_draw (GnomeCanvasItem *item,
if (x2 <= x1)
continue;
+ state = gtk_widget_get_state (GTK_WIDGET (canvas));
+
e_table_header_draw_button (drawable, ecol,
GTK_WIDGET (canvas)->style,
- GTK_WIDGET_STATE (canvas),
+ state,
GTK_WIDGET (canvas),
x1 - x, -y,
width, height,
@@ -1154,6 +1157,7 @@ ethi_start_drag (ETableHeaderItem *ethi, GdkEvent *event)
GtkWidget *widget = GTK_WIDGET (GNOME_CANVAS_ITEM (ethi)->canvas);
GtkTargetList *list;
GdkDragContext *context;
+ GtkStateType state;
ETableCol *ecol;
gint col_width;
GdkPixmap *pixmap;
@@ -1210,10 +1214,12 @@ ethi_start_drag (ETableHeaderItem *ethi, GdkEvent *event)
col_width = ecol->width;
pixmap = gdk_pixmap_new (widget->window, col_width, ethi->height, -1);
+ state = gtk_widget_get_state (widget);
+
e_table_header_draw_button (
pixmap, ecol,
widget->style,
- GTK_WIDGET_STATE (widget),
+ state,
widget,
0, 0,
col_width, ethi->height,