Replace GTK_WIDGET_STATE() with gtk_widget_get_state()

[evince.git] / libview / ev-view-presentation.c

diff --git a/libview/ev-view-presentation.c b/libview/ev-view-presentation.c
index 7d725414a1a96dee0add5210b216265893402c41..6ef1bb09d59c848917ee08dd74ae73b05a8c68e9 100644 (file)
--- a/libview/ev-view-presentation.c
+++ b/libview/ev-view-presentation.c
@@ -62,6 +62,7 @@ struct _EvViewPresentation
        guint                  rotation;
        EvPresentationState    state;
        gdouble                scale;
+       gint                   monitor_width;
        gint                   monitor_height;
 
        /* Cursors */
@@ -168,9 +169,14 @@ ev_view_presentation_get_scale_for_page (EvViewPresentation *pview,
                gdouble width, height;
 
                ev_document_get_page_size (pview->document, page, &width, &height);
-               pview->scale = (pview->rotation == 90 || pview->rotation == 270) ?
-                       pview->monitor_height / width :
-                       pview->monitor_height / height;
+               if (pview->rotation == 90 || pview->rotation == 270) {
+                       gdouble tmp;
+
+                       tmp = width;
+                       width = height;
+                       height = tmp;
+               }
+               pview->scale = MIN (pview->monitor_width / width, pview->monitor_height / height);
        }
 
        return pview->scale;
@@ -825,7 +831,7 @@ ev_view_presentation_set_cursor (EvViewPresentation *pview,
                return;
 
        widget = GTK_WIDGET (pview);
-       if (!GTK_WIDGET_REALIZED (widget))
+       if (!gtk_widget_get_realized (widget))
                gtk_widget_realize (widget);
 
        pview->cursor = view_cursor;
@@ -980,7 +986,7 @@ ev_view_presentation_draw_end_page (EvViewPresentation *pview)
 
        gtk_paint_layout (widget->style,
                          widget->window,
-                         GTK_WIDGET_STATE (widget),
+                         gtk_widget_get_state (widget),
                          FALSE,
                          &area,
                          widget,
@@ -1195,6 +1201,7 @@ init_presentation (GtkWidget *widget)
 
        monitor_num = gdk_screen_get_monitor_at_window (screen, widget->window);
        gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor);
+       pview->monitor_width = monitor.width;
        pview->monitor_height = monitor.height;
 
        ev_view_presentation_update_current_page (pview, pview->current_page);