summaryrefslogtreecommitdiff
path: root/navit/graphics
diff options
context:
space:
mode:
authorSebastian Leske <sebastian.leske@sleske.name>2015-08-31 18:09:23 +0200
committerSebastian Leske <sebastian.leske@sleske.name>2015-09-05 22:18:58 +0200
commit548d5f985b378e554cee70e0cd51711203955afb (patch)
treeb41fb0107d44176825735e3a383c964ee34daaca /navit/graphics
parent9bb4caf818dbbb686fb520980c9748a5c8a772e5 (diff)
downloadnavit-548d5f985b378e554cee70e0cd51711203955afb.tar.gz
gtk_drawing_area:Remove unused cleanup code.
Diffstat (limited to 'navit/graphics')
-rw-r--r--navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c16
1 files changed, 5 insertions, 11 deletions
diff --git a/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c b/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c
index 380b6f61c..1007a3564 100644
--- a/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c
+++ b/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c
@@ -66,7 +66,6 @@ struct graphics_priv {
struct window window;
cairo_t *cairo;
struct point p;
- struct point pclean;
int width;
int height;
int win_w;
@@ -531,15 +530,10 @@ draw_image_warp(struct graphics_priv *gr, struct graphics_gc_priv *fg, struct po
#endif
static void
-overlay_rect(struct graphics_priv *parent, struct graphics_priv *overlay, int clean, GdkRectangle *r)
+overlay_rect(struct graphics_priv *parent, struct graphics_priv *overlay, GdkRectangle *r)
{
- if (clean) {
- r->x=overlay->pclean.x;
- r->y=overlay->pclean.y;
- } else {
- r->x=overlay->p.x;
- r->y=overlay->p.y;
- }
+ r->x=overlay->p.x;
+ r->y=overlay->p.y;
r->width=overlay->width;
r->height=overlay->height;
if (!overlay->wraparound)
@@ -560,7 +554,7 @@ overlay_draw(struct graphics_priv *parent, struct graphics_priv *overlay, GdkRec
GdkRectangle or, ir;
if (parent->overlay_disabled || overlay->overlay_disabled || overlay->overlay_autodisabled)
return;
- overlay_rect(parent, overlay, 0, &or);
+ overlay_rect(parent, overlay, &or);
if (! gdk_rectangle_intersect(re, &or, &ir))
return;
or.x-=re->x;
@@ -846,7 +840,7 @@ overlay_disable(struct graphics_priv *gr, int disabled)
gr->overlay_disabled=disabled;
if (gr->parent) {
GdkRectangle r;
- overlay_rect(gr->parent, gr, 0, &r);
+ overlay_rect(gr->parent, gr, &r);
gdk_window_invalidate_rect(gr->parent->widget->window, &r, TRUE);
}
}