From 9c77b69d6ece7df775fd326f0afcc5a752b7a3bf Mon Sep 17 00:00:00 2001
From: Carlos Garcia Campos <carlosgc@gnome.org>
Date: Thu, 08 Jul 2010 08:22:11 +0000
Subject: Switch to GTK+ 3

---
(limited to 'libdocument')

diff --git a/libdocument/ev-document-text.c b/libdocument/ev-document-text.c
index fac4356..56c1a56 100644
--- a/libdocument/ev-document-text.c
+++ b/libdocument/ev-document-text.c
@@ -57,7 +57,7 @@ ev_document_text_get_text_layout (EvDocumentText   *document_text,
 	return iface->get_text_layout (document_text, page, areas, n_areas);
 }
 
-GdkRegion *
+cairo_region_t *
 ev_document_text_get_text_mapping (EvDocumentText *document_text,
 				   EvPage         *page)
 {
diff --git a/libdocument/ev-document-text.h b/libdocument/ev-document-text.h
index bb6c34b..abf1cc7 100644
--- a/libdocument/ev-document-text.h
+++ b/libdocument/ev-document-text.h
@@ -49,26 +49,26 @@ struct _EvDocumentTextInterface
         GTypeInterface base_iface;
 
         /* Methods */
-        GdkRegion *(* get_text_mapping) (EvDocumentText   *document_text,
-                                         EvPage           *page);
-        gchar     *(* get_text)         (EvDocumentText   *document_text,
-                                         EvPage           *page);
-        gboolean   (* get_text_layout)  (EvDocumentText   *document_text,
-                                         EvPage           *page,
-                                         EvRectangle     **areas,
-                                         guint            *n_areas);
+        cairo_region_t *(* get_text_mapping) (EvDocumentText   *document_text,
+					      EvPage           *page);
+        gchar          *(* get_text)         (EvDocumentText   *document_text,
+					      EvPage           *page);
+        gboolean        (* get_text_layout)  (EvDocumentText   *document_text,
+					      EvPage           *page,
+					      EvRectangle     **areas,
+					      guint            *n_areas);
 };
 
-GType      ev_document_text_get_type         (void) G_GNUC_CONST;
+GType           ev_document_text_get_type         (void) G_GNUC_CONST;
 
-gchar     *ev_document_text_get_text         (EvDocumentText  *document_text,
-                                              EvPage          *page);
-gboolean   ev_document_text_get_text_layout  (EvDocumentText  *document_text,
-                                              EvPage          *page,
-                                              EvRectangle    **areas,
-                                              guint           *n_areas);
-GdkRegion *ev_document_text_get_text_mapping (EvDocumentText  *document_text,
-                                              EvPage          *page);
+gchar          *ev_document_text_get_text         (EvDocumentText  *document_text,
+						   EvPage          *page);
+gboolean        ev_document_text_get_text_layout  (EvDocumentText  *document_text,
+						   EvPage          *page,
+						   EvRectangle    **areas,
+						   guint           *n_areas);
+cairo_region_t *ev_document_text_get_text_mapping (EvDocumentText  *document_text,
+						   EvPage          *page);
 
 G_END_DECLS
 
diff --git a/libdocument/ev-selection.c b/libdocument/ev-selection.c
index a34e863..49e56eb 100644
--- a/libdocument/ev-selection.c
+++ b/libdocument/ev-selection.c
@@ -62,7 +62,7 @@ ev_selection_get_selected_text (EvSelection      *selection,
 	return iface->get_selected_text (selection, page, style, points);
 }
 
-GdkRegion *
+cairo_region_t *
 ev_selection_get_selection_region (EvSelection     *selection,
 				   EvRenderContext *rc,
 				   EvSelectionStyle style,
diff --git a/libdocument/ev-selection.h b/libdocument/ev-selection.h
index 5c9c718..dff12e0 100644
--- a/libdocument/ev-selection.h
+++ b/libdocument/ev-selection.h
@@ -52,41 +52,41 @@ struct _EvSelectionInterface
 {
 	GTypeInterface base_iface;
 
-	void        (* render_selection)     (EvSelection      *selection,
-					      EvRenderContext  *rc,
-					      cairo_surface_t **surface,
-					      EvRectangle      *points,
-					      EvRectangle      *old_points,
-					      EvSelectionStyle  style,
-					      GdkColor         *text,
-					      GdkColor         *base);
-	gchar     * (* get_selected_text)    (EvSelection      *selection,
-					      EvPage           *page,
-					      EvSelectionStyle  style,
-					      EvRectangle      *points);
-	GdkRegion * (* get_selection_region) (EvSelection      *selection,
-					      EvRenderContext  *rc,
-					      EvSelectionStyle  style,
-					      EvRectangle      *points);
+	void             (* render_selection)     (EvSelection      *selection,
+						   EvRenderContext  *rc,
+						   cairo_surface_t **surface,
+						   EvRectangle      *points,
+						   EvRectangle      *old_points,
+						   EvSelectionStyle  style,
+						   GdkColor         *text,
+						   GdkColor         *base);
+	gchar          * (* get_selected_text)    (EvSelection      *selection,
+						   EvPage           *page,
+						   EvSelectionStyle  style,
+						   EvRectangle      *points);
+	cairo_region_t * (* get_selection_region) (EvSelection      *selection,
+						   EvRenderContext  *rc,
+						   EvSelectionStyle  style,
+						   EvRectangle      *points);
 };
 
-GType      ev_selection_get_type             (void);
-void       ev_selection_render_selection     (EvSelection      *selection,
-					      EvRenderContext  *rc,
-					      cairo_surface_t **surface,
-					      EvRectangle      *points,
-					      EvRectangle      *old_points,
-					      EvSelectionStyle  style,
-					      GdkColor         *text,
-					      GdkColor         *base);
-gchar     *ev_selection_get_selected_text    (EvSelection      *selection,
-					      EvPage           *page,
-					      EvSelectionStyle  style,
-					      EvRectangle      *points);
-GdkRegion *ev_selection_get_selection_region (EvSelection      *selection,
-					      EvRenderContext  *rc,
-					      EvSelectionStyle  style,
-					      EvRectangle      *points);
+GType           ev_selection_get_type             (void) G_GNUC_CONST;
+void            ev_selection_render_selection     (EvSelection      *selection,
+						   EvRenderContext  *rc,
+						   cairo_surface_t **surface,
+						   EvRectangle      *points,
+						   EvRectangle      *old_points,
+						   EvSelectionStyle  style,
+						   GdkColor         *text,
+						   GdkColor         *base);
+gchar          *ev_selection_get_selected_text    (EvSelection      *selection,
+						   EvPage           *page,
+						   EvSelectionStyle  style,
+						   EvRectangle      *points);
+cairo_region_t *ev_selection_get_selection_region (EvSelection      *selection,
+						   EvRenderContext  *rc,
+						   EvSelectionStyle  style,
+						   EvRectangle      *points);
 
 G_END_DECLS
 
--
cgit v0.9.1