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-week-view.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 'calendar/gui/e-week-view.c')
| -rw-r--r-- | calendar/gui/e-week-view.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c index 2c44d26458..c319520924 100644 --- a/calendar/gui/e-week-view.c +++ b/calendar/gui/e-week-view.c @@ -2365,7 +2365,11 @@ e_week_view_on_button_press (GtkWidget *widget, if (event->button == 1) { /* Start the selection drag. */ +#if GTK_CHECK_VERSION(2,19,7) + if (!gtk_widget_has_focus (GTK_WIDGET (week_view)) && !gtk_widget_has_focus (GTK_WIDGET (week_view->main_canvas))) +#else if (!GTK_WIDGET_HAS_FOCUS (week_view) && !GTK_WIDGET_HAS_FOCUS (week_view->main_canvas)) +#endif gtk_widget_grab_focus (GTK_WIDGET (week_view)); if (gdk_pointer_grab (GTK_LAYOUT (widget)->bin_window, FALSE, @@ -2384,7 +2388,11 @@ e_week_view_on_button_press (GtkWidget *widget, gtk_widget_queue_draw (week_view->main_canvas); } } else if (event->button == 3) { +#if GTK_CHECK_VERSION(2,19,7) + if (!gtk_widget_has_focus (GTK_WIDGET (week_view))) +#else if (!GTK_WIDGET_HAS_FOCUS (week_view)) +#endif gtk_widget_grab_focus (GTK_WIDGET (week_view)); if (day < week_view->selection_start_day || day > week_view->selection_end_day) { @@ -3391,7 +3399,11 @@ e_week_view_on_text_item_event (GnomeCanvasItem *item, e = &g_array_index (week_view->events, EWeekViewEvent, event_num); +#if GTK_CHECK_VERSION(2,19,7) + if (!gtk_widget_has_focus (GTK_WIDGET (week_view))) +#else if (!GTK_WIDGET_HAS_FOCUS (week_view)) +#endif gtk_widget_grab_focus (GTK_WIDGET (week_view)); e_week_view_set_selected_time_range_visible (week_view, e->start, e->end); |