dropped renderer->overlay_draw

diff --git a/src/pixbuf-renderer.c b/src/pixbuf-renderer.c
index a7d744e..8562ed6 100644 (file)
--- a/src/pixbuf-renderer.c
+++ b/src/pixbuf-renderer.c
@@ -2344,18 +2344,8 @@ static void pr_set_pixbuf(PixbufRenderer *pr, GdkPixbuf *pixbuf, gdouble zoom, P
 
                box = GTK_WIDGET(pr);
 
-#if GTK_CHECK_VERSION(2,20,0)
-               if (gtk_widget_get_realized(box))
-#else
-               if (GTK_WIDGET_REALIZED(box))
-#endif
-                       {
-#if !GTK_CHECK_VERSION(3,0,0)
-                       gdk_window_clear(gtk_widget_get_window(box));
-#endif
-                       pr->renderer->overlay_draw(pr->renderer, 0, 0, pr->viewport_width, pr->viewport_height);
-                       if (pr->renderer2) pr->renderer2->overlay_draw(pr->renderer2, 0, 0, pr->viewport_width, pr->viewport_height);
-                       }
+               pr->renderer->update_pixbuf(pr->renderer, flags & PR_ZOOM_LAZY);
+               if (pr->renderer2) pr->renderer2->update_pixbuf(pr->renderer2, flags & PR_ZOOM_LAZY);
 
                pr_update_signal(pr);
 

diff --git a/src/pixbuf-renderer.h b/src/pixbuf-renderer.h
index 7b5fc6a..79a586e 100644 (file)
--- a/src/pixbuf-renderer.h
+++ b/src/pixbuf-renderer.h
@@ -84,7 +84,6 @@ struct _RendererFuncs
        gint (*overlay_add)(void *renderer, GdkPixbuf *pixbuf, gint x, gint y, OverlayRendererFlags flags);
        void (*overlay_set)(void *renderer, gint id, GdkPixbuf *pixbuf, gint x, gint y);
        gboolean (*overlay_get)(void *renderer, gint id, GdkPixbuf **pixbuf, gint *x, gint *y);
-       void (*overlay_draw)(void *renderer, gint x, gint y, gint w, gint h);
 
        void (*stereo_set)(void *renderer, gint stereo_mode); /* set stereo mode */
 

diff --git a/src/renderer-clutter.c b/src/renderer-clutter.c
index a3821d4..7dd0b2d 100644 (file)
--- a/src/renderer-clutter.c
+++ b/src/renderer-clutter.c
@@ -631,11 +631,6 @@ static void rc_overlay_free_all(RendererClutter *rc)
                }
 }
 
-
-static void rc_overlay_draw(void *renderer, gint x, gint y, gint w, gint h)
-{
-}
-
 static gint rc_overlay_add(void *renderer, GdkPixbuf *pixbuf, gint x, gint y, OverlayRendererFlags flags)
 {
        RendererClutter *rc = (RendererClutter *)renderer;
@@ -833,7 +828,6 @@ RendererFuncs *renderer_clutter_new(PixbufRenderer *pr)
        rc->f.overlay_add = rc_overlay_add;
        rc->f.overlay_set = rc_overlay_set;
        rc->f.overlay_get = rc_overlay_get;
-       rc->f.overlay_draw = rc_overlay_draw;
 
        rc->f.stereo_set = rc_stereo_set;
        

diff --git a/src/renderer-tiles.c b/src/renderer-tiles.c
index c4a98ba..7778716 100644 (file)
--- a/src/renderer-tiles.c
+++ b/src/renderer-tiles.c
@@ -2072,11 +2072,6 @@ static void renderer_invalidate_region(void *renderer, gint x, gint y, gint w, g
        rt_tile_invalidate_region((RendererTiles *)renderer, x, y, w, h);
 }
 
-static void renderer_overlay_draw(void *renderer, gint x, gint y, gint w, gint h)
-{
-       rt_overlay_draw((RendererTiles *)renderer, x, y, w, h, NULL);
-}
-
 static void renderer_update_viewport(void *renderer)
 {
        RendererTiles *rt = (RendererTiles *)renderer;
@@ -2216,7 +2211,6 @@ RendererFuncs *renderer_tiles_new(PixbufRenderer *pr)
        rt->f.overlay_add = renderer_tiles_overlay_add;
        rt->f.overlay_set = renderer_tiles_overlay_set;
        rt->f.overlay_get = renderer_tiles_overlay_get;
-       rt->f.overlay_draw = renderer_overlay_draw;
 
        rt->f.stereo_set = renderer_stereo_set;