Replace GTK_WIDGET_HAS_FOCUS() with gtk_widget_has_focus()

diff --git a/cut-n-paste/gimpcellrenderertoggle/gimpcellrenderertoggle.c b/cut-n-paste/gimpcellrenderertoggle/gimpcellrenderertoggle.c
index 47da7cad6a6dc47bfce3b0b1297d3be50ccafe46..00b785c8dacf783a9652f48c404014ec505f970d 100644 (file)
--- 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 b1cff289a1e04167f0a610b1fac09db0144625a4..f4a39163f7abe689deeec5ce0346fd1880a02fa1 100644 (file)
--- 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 87e78b4ceedbe138bb88ba6963181d862fa90303..3827fdbf098a485c790748149dc87e65c2ace02a 100644 (file)
--- 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 9c125d3135102f8a5c6669fcde7b9b9e1344dfa9..ee713d4219c06e39398ce405fa8dbc49384cd62a 100644 (file)
--- 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 60c7ae0aca7de6977c7da98431412a00dac658c9..18917f7b8eabc703e29f73d9a93c0d30e6429202 100644 (file)
--- 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);
        }