Replace GTK_WIDGET_IS_SENSITIVE() with gtk_widget_is_sensitive()

[evince.git] / libview / ev-annotation-window.c

diff --git a/libview/ev-annotation-window.c b/libview/ev-annotation-window.c
index 1991168df35ba424b1cf932c1833e2f73971a373..5a1a9a62992b0105d7c236754e1c565ee22c2aae 100644 (file)
--- a/libview/ev-annotation-window.c
+++ b/libview/ev-annotation-window.c
@@ -26,6 +26,7 @@
 #include "ev-annotation-window.h"
 #include "ev-stock-icons.h"
 #include "ev-view-marshal.h"
+#include "ev-document-misc.h"
 
 enum {
        PROP_0,
@@ -103,17 +104,12 @@ send_focus_change (GtkWidget *widget,
 }
 
 static gdouble
-get_screen_dpi (GtkWindow *window)
+get_screen_dpi (EvAnnotationWindow *window)
 {
        GdkScreen *screen;
-       gdouble    xdpi, ydpi;
 
-       screen = gtk_window_get_screen (window);
-
-       xdpi = 25.4 * gdk_screen_get_width (screen) / gdk_screen_get_width_mm (screen);
-       ydpi = 25.4 * gdk_screen_get_height (screen) / gdk_screen_get_height_mm (screen);
-
-       return (xdpi + ydpi) / 2.0;
+       screen = gtk_window_get_screen (GTK_WINDOW (window));
+       return ev_document_misc_get_screen_dpi (screen);
 }
 
 static GtkIconSize
@@ -253,7 +249,7 @@ ev_annotation_window_set_resize_cursor (GtkWidget          *widget,
        if (!widget->window)
                return;
 
-       if (GTK_WIDGET_IS_SENSITIVE (widget)) {
+       if (gtk_widget_is_sensitive (widget)) {
                GdkDisplay *display = gtk_widget_get_display (widget);
                GdkCursor  *cursor;
 
@@ -423,7 +419,7 @@ ev_annotation_window_constructor (GType                  type,
        rect = window->rect;
 
        /* Rectangle is at doc resolution (72.0) */
-       scale = get_screen_dpi (GTK_WINDOW (window)) / 72.0;
+       scale = get_screen_dpi (window) / 72.0;
        gtk_window_resize (GTK_WINDOW (window),
                           (gint)((rect->x2 - rect->x1) * scale),
                           (gint)((rect->y2 - rect->y1) * scale));
@@ -631,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);
        }
@@ -642,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);
        }