From 765e79bb75503f6369e0e3d289d40053e1872eaf Mon Sep 17 00:00:00 2001 From: Hib Eris Date: Mon, 29 Mar 2010 16:47:23 +0200 Subject: [PATCH] Replace GTK_WIDGET_HAS_FOCUS() with gtk_widget_has_focus() --- cut-n-paste/gimpcellrenderertoggle/gimpcellrenderertoggle.c | 2 +- libview/ev-annotation-window.c | 4 ++-- libview/ev-pixbuf-cache.c | 2 +- libview/ev-view.c | 4 ++-- shell/ev-sidebar-attachments.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cut-n-paste/gimpcellrenderertoggle/gimpcellrenderertoggle.c b/cut-n-paste/gimpcellrenderertoggle/gimpcellrenderertoggle.c index 47da7cad..00b785c8 100644 --- a/cut-n-paste/gimpcellrenderertoggle/gimpcellrenderertoggle.c +++ b/cut-n-paste/gimpcellrenderertoggle/gimpcellrenderertoggle.c @@ -315,7 +315,7 @@ gimp_cell_renderer_toggle_render (GtkCellRenderer *cell, } else if ((flags & GTK_CELL_RENDERER_SELECTED) == GTK_CELL_RENDERER_SELECTED) { - if (GTK_WIDGET_HAS_FOCUS (widget)) + if (gtk_widget_has_focus (widget)) state = GTK_STATE_SELECTED; else state = GTK_STATE_ACTIVE; diff --git a/libview/ev-annotation-window.c b/libview/ev-annotation-window.c index b1cff289..f4a39163 100644 --- a/libview/ev-annotation-window.c +++ b/libview/ev-annotation-window.c @@ -627,7 +627,7 @@ ev_annotation_window_grab_focus (EvAnnotationWindow *window) { g_return_if_fail (EV_IS_ANNOTATION_WINDOW (window)); - if (!GTK_WIDGET_HAS_FOCUS (window->text_view)) { + if (!gtk_widget_has_focus (window->text_view)) { gtk_widget_grab_focus (GTK_WIDGET (window)); send_focus_change (window->text_view, TRUE); } @@ -638,7 +638,7 @@ ev_annotation_window_ungrab_focus (EvAnnotationWindow *window) { g_return_if_fail (EV_IS_ANNOTATION_WINDOW (window)); - if (GTK_WIDGET_HAS_FOCUS (window->text_view)) { + if (gtk_widget_has_focus (window->text_view)) { send_focus_change (window->text_view, FALSE); } diff --git a/libview/ev-pixbuf-cache.c b/libview/ev-pixbuf-cache.c index 87e78b4c..3827fdbf 100644 --- a/libview/ev-pixbuf-cache.c +++ b/libview/ev-pixbuf-cache.c @@ -479,7 +479,7 @@ ev_pixbuf_cache_clear_job_sizes (EvPixbufCache *pixbuf_cache, static void get_selection_colors (GtkWidget *widget, GdkColor **text, GdkColor **base) { - if (GTK_WIDGET_HAS_FOCUS (widget)) { + if (gtk_widget_has_focus (widget)) { *text = &widget->style->text [GTK_STATE_SELECTED]; *base = &widget->style->base [GTK_STATE_SELECTED]; } else { diff --git a/libview/ev-view.c b/libview/ev-view.c index 9c125d31..ee713d42 100644 --- a/libview/ev-view.c +++ b/libview/ev-view.c @@ -3250,7 +3250,7 @@ ev_view_button_press_event (GtkWidget *widget, if (!view->document) return FALSE; - if (!GTK_WIDGET_HAS_FOCUS (widget)) { + if (!gtk_widget_has_focus (widget)) { gtk_widget_grab_focus (widget); } @@ -3762,7 +3762,7 @@ ev_view_key_press_event (GtkWidget *widget, if (!view->document) return FALSE; - if (!GTK_WIDGET_HAS_FOCUS (widget)) { + if (!gtk_widget_has_focus (widget)) { /* Forward key events to current focused window child */ if (view->window_child_focus) { GdkEventKey *new_event; diff --git a/shell/ev-sidebar-attachments.c b/shell/ev-sidebar-attachments.c index 60c7ae0a..18917f7b 100644 --- a/shell/ev-sidebar-attachments.c +++ b/shell/ev-sidebar-attachments.c @@ -273,7 +273,7 @@ ev_sidebar_attachments_button_press (EvSidebarAttachments *ev_attachbar, GdkEventButton *event, GtkWidget *icon_view) { - if (!GTK_WIDGET_HAS_FOCUS (icon_view)) { + if (!gtk_widget_has_focus (icon_view)) { gtk_widget_grab_focus (icon_view); } -- 2.43.5