[dualscreen] fix crash on ctrl+w and fix control window closing

[evince.git] / libdocument / ev-selection.c

diff --git a/libdocument/ev-selection.c b/libdocument/ev-selection.c
index 017036f45b091bc3b38a6992e58b9dfa96c9ff87..49e56eb434ae3967e54d5b439571ec557a828a1d 100644 (file)
--- a/libdocument/ev-selection.c
+++ b/libdocument/ev-selection.c
@@ -14,7 +14,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
 
@@ -22,10 +22,10 @@
 
 #include "ev-selection.h"
 
-EV_DEFINE_INTERFACE (EvSelection, ev_selection, 0)
+G_DEFINE_INTERFACE (EvSelection, ev_selection, 0)
 
 static void
-ev_selection_class_init (EvSelectionIface *klass)
+ev_selection_default_init (EvSelectionInterface *klass)
 {
 }
 
@@ -39,7 +39,7 @@ ev_selection_render_selection (EvSelection      *selection,
                               GdkColor         *text,
                               GdkColor         *base)
 {
-       EvSelectionIface *iface = EV_SELECTION_GET_IFACE (selection);
+       EvSelectionInterface *iface = EV_SELECTION_GET_IFACE (selection);
 
        if (!iface->render_selection)
                return;
@@ -53,37 +53,25 @@ ev_selection_render_selection (EvSelection      *selection,
 
 gchar *
 ev_selection_get_selected_text (EvSelection      *selection,
-                               EvRenderContext  *rc,
+                               EvPage           *page,
                                EvSelectionStyle  style,
                                EvRectangle      *points)
 {
-       EvSelectionIface *iface = EV_SELECTION_GET_IFACE (selection);
+       EvSelectionInterface *iface = EV_SELECTION_GET_IFACE (selection);
 
-       return iface->get_selected_text (selection, rc, style, points);
+       return iface->get_selected_text (selection, page, style, points);
 }
 
-GdkRegion *
+cairo_region_t *
 ev_selection_get_selection_region (EvSelection     *selection,
                                   EvRenderContext *rc,
                                   EvSelectionStyle style,
                                   EvRectangle     *points)
 {
-       EvSelectionIface *iface = EV_SELECTION_GET_IFACE (selection);
+       EvSelectionInterface *iface = EV_SELECTION_GET_IFACE (selection);
 
        if (!iface->get_selection_region)
                return NULL;
        
        return iface->get_selection_region (selection, rc, style, points);
 }
-
-GdkRegion *
-ev_selection_get_selection_map (EvSelection *selection,
-                               EvPage      *page)
-{
-       EvSelectionIface *iface = EV_SELECTION_GET_IFACE (selection);
-
-       if (!iface->get_selection_map)
-               return NULL;
-
-       return iface->get_selection_map (selection, page);
-}