X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-view.h;h=424cecc95b04a6fd0727ed34a872b1cbe31b2635;hb=0be3be0d4166be324d628802772e99cacd336f11;hp=0c6d608c2297f963a5e57641a3e2e5999a5e7351;hpb=c2f1fb8f6d068c53e73e5bcdb7583569dd6c638a;p=evince.git

diff --git a/shell/ev-view.h b/shell/ev-view.h
index 0c6d608c..424cecc9 100644
--- a/shell/ev-view.h
+++ b/shell/ev-view.h
@@ -20,9 +20,7 @@
 #ifndef __EV_VIEW_H__
 #define __EV_VIEW_H__
 
-#include <gtk/gtkwidget.h>
-#include <gtk/gtklayout.h>
-#include <gtk/gtkscrolledwindow.h>
+#include <gtk/gtk.h>
 
 #include "ev-document.h"
 #include "ev-link.h"
@@ -37,9 +35,6 @@ G_BEGIN_DECLS
 #define EV_TYPE_SIZING_MODE     (ev_sizing_mode_get_type())
 #define EV_SIZING_MODE_CLASS    (g_type_class_peek (EV_TYPE_SIZING_MODE))
 
-#define EV_TYPE_SCROLL_TYPE     (ev_scroll_type_get_type())
-#define EV_SCROLL_TYPE_CLASS    (g_type_class_peek (EV_TYPE_SCROLL_TYPE))
-
 typedef struct _EvView       EvView;
 typedef struct _EvViewClass  EvViewClass;
 
@@ -55,18 +50,8 @@ typedef enum {
 	EV_VIEW_SELECTION_RECTANGLE,
 } EvViewSelectionMode;
 
-typedef enum {
-	EV_SCROLL_PAGE_FORWARD,
-	EV_SCROLL_PAGE_BACKWARD,
-	EV_SCROLL_STEP_BACKWARD,
-	EV_SCROLL_STEP_FORWARD,
-	EV_SCROLL_STEP_DOWN,
-	EV_SCROLL_STEP_UP,
-} EvScrollType;
-
 GType		ev_view_get_type	  (void) G_GNUC_CONST;
 GType           ev_sizing_mode_get_type   (void) G_GNUC_CONST;
-GType           ev_scroll_type_get_type   (void) G_GNUC_CONST;
 
 GtkWidget*	ev_view_new		  (void);
 void		ev_view_set_document	  (EvView         *view,
@@ -119,18 +104,15 @@ void            ev_view_set_rotation      (EvView         *view,
 int             ev_view_get_rotation      (EvView         *view);
 
 /* Find */
-gboolean        ev_view_can_find_next        (EvView         *view);
-void            ev_view_find_next            (EvView         *view);
-gboolean        ev_view_can_find_previous    (EvView         *view);
-void            ev_view_find_previous        (EvView         *view);
-void            ev_view_search_changed       (EvView         *view);
-void     	ev_view_set_highlight_search (EvView         *view,
-					      gboolean        value);
-void            ev_view_find_cancel          (EvView         *view);
-
-/* Status */
-const char     *ev_view_get_status        (EvView         *view);
-const char     *ev_view_get_find_status   (EvView         *view);
+void            ev_view_find_next                 (EvView         *view);
+void            ev_view_find_previous             (EvView         *view);
+void            ev_view_find_search_changed       (EvView         *view);
+void     	ev_view_find_set_highlight_search (EvView         *view,
+						   gboolean        value);
+void            ev_view_find_changed              (EvView         *view,
+						   GList         **results,
+						   gint            page);
+void            ev_view_find_cancel               (EvView         *view);
 
 /* Cursor */
 void           ev_view_hide_cursor        (EvView         *view);
@@ -138,7 +120,7 @@ void           ev_view_show_cursor        (EvView         *view);
 
 /* Navigation */
 void	       ev_view_scroll             (EvView         *view,
-	                                   EvScrollType    scroll,
+	                                   GtkScrollType   scroll,
 					   gboolean        horizontal);
 void	       ev_view_handle_link        (EvView         *view,
 					   EvLink         *link);
@@ -146,7 +128,8 @@ gboolean       ev_view_next_page	  (EvView         *view);
 gboolean       ev_view_previous_page	  (EvView         *view);
 gchar*         ev_view_page_label_from_dest (EvView *view, EvLinkDest *dest);
 
-void           ev_view_update_view_size (EvView *view, GtkScrolledWindow *scrolled_window);
+void           ev_view_update_view_size   (EvView            *view,
+					   GtkScrolledWindow *scrolled_window);
 
 void	       ev_view_autoscroll_start   (EvView *view);
 void           ev_view_autoscroll_stop    (EvView *view);