diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-03-05 12:38:41 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-03-05 20:36:23 +0800 |
| commit | 2836a54dd6d61e35d1446f9a23a628064516a309 (patch) | |
| tree | b9cb2ab39212de803e935ed28957ee77e73c2d96 /widgets/table/e-table-item.c | |
| parent | baa7f20333a5bbb7c8cbb3cf2ce86b57aba79ef2 (diff) | |
| download | gsoc2013-evolution-2836a54dd6d61e35d1446f9a23a628064516a309.tar gsoc2013-evolution-2836a54dd6d61e35d1446f9a23a628064516a309.tar.gz gsoc2013-evolution-2836a54dd6d61e35d1446f9a23a628064516a309.tar.bz2 gsoc2013-evolution-2836a54dd6d61e35d1446f9a23a628064516a309.tar.lz gsoc2013-evolution-2836a54dd6d61e35d1446f9a23a628064516a309.tar.xz gsoc2013-evolution-2836a54dd6d61e35d1446f9a23a628064516a309.tar.zst gsoc2013-evolution-2836a54dd6d61e35d1446f9a23a628064516a309.zip | |
Work around recent GTK+ deprecations.
Diffstat (limited to 'widgets/table/e-table-item.c')
| -rw-r--r-- | widgets/table/e-table-item.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c index 06e847f40e..22a0848d7f 100644 --- a/widgets/table/e-table-item.c +++ b/widgets/table/e-table-item.c @@ -251,7 +251,11 @@ eti_get_cell_background_color (ETableItem *eti, gint row, gint col, gboolean sel gboolean allocated = FALSE; if (selected) { +#if GTK_CHECK_VERSION(2,19,7) + if (gtk_widget_has_focus (canvas)) +#else if (GTK_WIDGET_HAS_FOCUS(canvas)) +#endif background = &canvas->style->bg [GTK_STATE_SELECTED]; else background = &canvas->style->bg [GTK_STATE_ACTIVE]; @@ -299,7 +303,11 @@ eti_get_cell_foreground_color (ETableItem *eti, gint row, gint col, gboolean sel *allocated = FALSE; if (selected) { +#if GTK_CHECK_VERSION(2,19,7) + if (gtk_widget_has_focus (canvas)) +#else if (GTK_WIDGET_HAS_FOCUS (canvas)) +#endif foreground = &canvas->style->fg [GTK_STATE_SELECTED]; else foreground = &canvas->style->fg [GTK_STATE_ACTIVE]; @@ -1925,7 +1933,11 @@ eti_draw (GnomeCanvasItem *item, GdkDrawable *drawable, gint x, gint y, gint wid gdk_color_free (background); flags = col_selected ? E_CELL_SELECTED : 0; +#if GTK_CHECK_VERSION(2,19,7) + flags |= gtk_widget_has_focus (canvas) ? E_CELL_FOCUSED : 0; +#else flags |= GTK_WIDGET_HAS_FOCUS(canvas) ? E_CELL_FOCUSED : 0; +#endif flags |= cursor ? E_CELL_CURSOR : 0; switch (ecol->justification) { |