Fix build with gtk+ >= 2.11.5 due to gtktooltips deprecation. Fixes bug

[evince.git] / shell / ev-view-private.h

diff --git a/shell/ev-view-private.h b/shell/ev-view-private.h
index ec1fa020f16bc8a3ea384011ae0a5ecebc4a14ae..4908711fbe06c1e01e88456f4a25b16ffeb713b4 100644 (file)
--- a/shell/ev-view-private.h
+++ b/shell/ev-view-private.h
@@ -25,6 +25,7 @@
 #include "ev-pixbuf-cache.h"
 #include "ev-page-cache.h"
 #include "ev-image.h"
 #include "ev-pixbuf-cache.h"
 #include "ev-page-cache.h"
 #include "ev-image.h"

+#include "ev-form-field.h"

 
 /* Information for middle clicking and moving around the doc */
 typedef struct {
 
 /* Information for middle clicking and moving around the doc */
 typedef struct {


@@ -73,7 +74,7 @@ typedef enum {
 } EvPresentationState;
 
 struct _EvView {
 } EvPresentationState;
 
 struct _EvView {

-       GtkWidget parent_instance;
+       GtkLayout layout;

 
        EvDocument *document;
 
 
        EvDocument *document;
 


@@ -104,9 +105,12 @@ struct _EvView {
        gint end_page;
        gint current_page;
 
        gint end_page;
        gint current_page;
 

-       int rotation;
-       double scale;
-       int spacing;
+       gint rotation;
+       gdouble scale;
+       gint spacing;
+       gdouble dpi;
+       gdouble max_scale;
+       gdouble min_scale;

 
        gboolean loading;
        gboolean continuous;
 
        gboolean loading;
        gboolean continuous;


@@ -114,6 +118,7 @@ struct _EvView {
        gboolean fullscreen;
        gboolean presentation;
        EvSizingMode sizing_mode;
        gboolean fullscreen;
        gboolean presentation;
        EvSizingMode sizing_mode;

+       cairo_surface_t *loading_text;

 
        /* Presentation */
        EvPresentationState presentation_state;
 
        /* Presentation */
        EvPresentationState presentation_state;


@@ -148,15 +153,14 @@ struct _EvView {
 };
 
 struct _EvViewClass {
 };
 
 struct _EvViewClass {

-       GtkWidgetClass parent_class;
+       GtkLayoutClass parent_class;

 
 

-       void    (*set_scroll_adjustments) (EvView         *view,
-                                          GtkAdjustment  *hadjustment,
-                                          GtkAdjustment  *vadjustment);

        void    (*binding_activated)      (EvView         *view,
                                           EvScrollType   scroll,
                                           gboolean        horizontal);
        void    (*zoom_invalid)           (EvView         *view);
        void    (*binding_activated)      (EvView         *view,
                                           EvScrollType   scroll,
                                           gboolean        horizontal);
        void    (*zoom_invalid)           (EvView         *view);

+       void    (*handle_link)            (EvView         *view,
+                                          EvLink         *link);

        void    (*external_link)          (EvView         *view,
                                           EvLinkAction   *action);
        void    (*popup_menu)             (EvView         *view,
        void    (*external_link)          (EvView         *view,
                                           EvLinkAction   *action);
        void    (*popup_menu)             (EvView         *view,