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 /calendar/gui/e-timezone-entry.c | |
| parent | baa7f20333a5bbb7c8cbb3cf2ce86b57aba79ef2 (diff) | |
| download | gsoc2013-evolution-2836a54dd6d61e35d1446f9a23a628064516a309.tar.gz gsoc2013-evolution-2836a54dd6d61e35d1446f9a23a628064516a309.tar.zst gsoc2013-evolution-2836a54dd6d61e35d1446f9a23a628064516a309.zip | |
Work around recent GTK+ deprecations.
Diffstat (limited to 'calendar/gui/e-timezone-entry.c')
| -rw-r--r-- | calendar/gui/e-timezone-entry.c | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/calendar/gui/e-timezone-entry.c b/calendar/gui/e-timezone-entry.c index a01c060491..309661a2db 100644 --- a/calendar/gui/e-timezone-entry.c +++ b/calendar/gui/e-timezone-entry.c @@ -236,20 +236,44 @@ timezone_entry_focus (GtkWidget *widget, priv = E_TIMEZONE_ENTRY_GET_PRIVATE (widget); if (direction == GTK_DIR_TAB_FORWARD) { +#if GTK_CHECK_VERSION(2,19,7) + if (gtk_widget_has_focus (priv->entry)) +#else if (GTK_WIDGET_HAS_FOCUS (priv->entry)) +#endif gtk_widget_grab_focus (priv->button); +#if GTK_CHECK_VERSION(2,19,7) + else if (gtk_widget_has_focus (priv->button)) +#else else if (GTK_WIDGET_HAS_FOCUS (priv->button)) +#endif return FALSE; +#if GTK_CHECK_VERSION(2,19,7) + else if (gtk_widget_get_visible (priv->entry)) +#else else if (GTK_WIDGET_VISIBLE (priv->entry)) +#endif gtk_widget_grab_focus (priv->entry); else gtk_widget_grab_focus (priv->button); } else if (direction == GTK_DIR_TAB_BACKWARD) { +#if GTK_CHECK_VERSION(2,19,7) + if (gtk_widget_has_focus (priv->entry)) +#else if (GTK_WIDGET_HAS_FOCUS (priv->entry)) +#endif return FALSE; +#if GTK_CHECK_VERSION(2,19,7) + else if (gtk_widget_has_focus (priv->button)) { +#else else if (GTK_WIDGET_HAS_FOCUS (priv->button)) { +#endif +#if GTK_CHECK_VERSION(2,19,7) + if (gtk_widget_get_visible (priv->entry)) +#else if (GTK_WIDGET_VISIBLE (priv->entry)) +#endif gtk_widget_grab_focus (priv->entry); else return FALSE; |