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/text | |
| 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/text')
| -rw-r--r-- | widgets/text/e-text.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c index e31b3e519b..f964ae9bb1 100644 --- a/widgets/text/e-text.c +++ b/widgets/text/e-text.c @@ -1439,7 +1439,11 @@ e_text_draw (GnomeCanvasItem *item, GdkDrawable *drawable, widget = gtk_widget_get_parent (widget); while (widget && !GTK_IS_BUTTON(widget)) { +#if GTK_CHECK_VERSION(2,19,7) + if (gtk_widget_get_has_window (widget)) { +#else if (!GTK_WIDGET_NO_WINDOW (widget)) { +#endif widget = NULL; break; } @@ -1494,7 +1498,11 @@ e_text_draw (GnomeCanvasItem *item, GdkDrawable *drawable, thisy += (1 + default_spacing) / 2; } +#if GTK_CHECK_VERSION(2,19,7) + if (gtk_widget_has_focus (widget)) { +#else if (GTK_WIDGET_HAS_FOCUS (widget)) { +#endif thisx += 1; thisy += 1; thiswidth -= 2; @@ -1514,7 +1522,11 @@ e_text_draw (GnomeCanvasItem *item, GdkDrawable *drawable, thisx + xoff, thisy + yoff, thiswidth, thisheight); +#if GTK_CHECK_VERSION(2,19,7) + if (gtk_widget_has_focus (widget)) { +#else if (GTK_WIDGET_HAS_FOCUS (widget)) { +#endif thisx -= 1; thisy -= 1; thiswidth += 2; |