diff options
| author | sleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2015-01-25 13:35:47 +0000 |
|---|---|---|
| committer | sleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2015-01-25 13:35:47 +0000 |
| commit | 76efbd74b76062a5cffba5e7af87264ac7bf2ea2 (patch) | |
| tree | 2d1054bd011efe93b68bae0533472610577bf836 /navit | |
| parent | f9d4de5a29528983d852dae1096a6bc6b1814ec6 (diff) | |
| download | navit-76efbd74b76062a5cffba5e7af87264ac7bf2ea2.tar.gz | |
Fix:core:Remove unused draw modes draw_mode_begin_clear and draw_mode_cursor.
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@6009 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit')
| -rw-r--r-- | navit/android/src/org/navitproject/navit/NavitGraphics.java | 8 | ||||
| -rw-r--r-- | navit/graphics.c | 2 | ||||
| -rw-r--r-- | navit/graphics.h | 2 | ||||
| -rw-r--r-- | navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c | 8 |
4 files changed, 6 insertions, 14 deletions
diff --git a/navit/android/src/org/navitproject/navit/NavitGraphics.java b/navit/android/src/org/navitproject/navit/NavitGraphics.java index 186f70919..b854f3258 100644 --- a/navit/android/src/org/navitproject/navit/NavitGraphics.java +++ b/navit/android/src/org/navitproject/navit/NavitGraphics.java @@ -933,10 +933,8 @@ public class NavitGraphics /* These constants must be synchronized with enum draw_mode_num in graphics.h. */ public static final int draw_mode_begin = 0; - public static final int draw_mode_begin_clear = 1; - public static final int draw_mode_end = 2; - public static final int draw_mode_cursor = 3; - public static final int draw_mode_end_lazy = 4; + public static final int draw_mode_end = 1; + public static final int draw_mode_end_lazy = 2; protected void draw_mode(int mode) { @@ -950,7 +948,7 @@ public class NavitGraphics parent_graphics.view.invalidate(get_rect()); } } - if (mode == draw_mode_begin_clear || (mode == draw_mode_begin && parent_graphics != null)) { + if (mode == draw_mode_begin && parent_graphics != null) { draw_bitmap.eraseColor(0); } diff --git a/navit/graphics.c b/navit/graphics.c index d89d532d7..515154e51 100644 --- a/navit/graphics.c +++ b/navit/graphics.c @@ -2548,7 +2548,7 @@ void graphics_displaylist_draw(struct graphics *gra, struct displaylist *display graphics_background_gc(gra, gra->gc[0]); if (flags & 1) callback_list_call_attr_0(gra->cbl, attr_predraw); - gra->meth.draw_mode(gra->priv, (flags & 8)?draw_mode_begin_clear:draw_mode_begin); + gra->meth.draw_mode(gra->priv, draw_mode_begin); if (!(flags & 2)) gra->meth.draw_rectangle(gra->priv, gra->gc[0]->priv, &gra->r.lu, gra->r.rl.x-gra->r.lu.x, gra->r.rl.y-gra->r.lu.y); if (l) { diff --git a/navit/graphics.h b/navit/graphics.h index a884aa0d1..752306008 100644 --- a/navit/graphics.h +++ b/navit/graphics.h @@ -37,7 +37,7 @@ struct mapset; /* This enum must be synchronized with the constants in NavitGraphics.java. */ enum draw_mode_num { - draw_mode_begin, draw_mode_begin_clear, draw_mode_end, draw_mode_cursor, draw_mode_end_lazy + draw_mode_begin, draw_mode_end, draw_mode_end_lazy }; struct graphics_priv; 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 618ba66f2..2f2ee3ac3 100644 --- a/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c +++ b/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c @@ -663,13 +663,7 @@ draw_mode(struct graphics_priv *gr, enum draw_mode_num mode) { GdkRectangle r; struct graphics_priv *overlay; -#if 0 - if (mode == draw_mode_begin) { - if (! gr->parent && gr->background_gc) - gdk_draw_rectangle(gr->drawable, gr->background_gc->gc, TRUE, 0, 0, gr->width, gr->height); - } -#endif - if (mode == draw_mode_end && gr->mode != draw_mode_cursor) { + if (mode == draw_mode_end) { if (gr->parent) { if (gr->cleanup) { overlay_rect(gr->parent, gr, 1, &r); |