Refactor:core:Remove unused method graphics_draw_restore.

git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@6015 ffa7fe5e-494d-0410-b361-a75ebd5db220

11 files changed, 0 insertions, 75 deletions

diff --git a/navit/graphics.c b/navit/graphics.c
index 515154e5..cfd6a68f 100644
--- a/navit/graphics.c
+++ b/navit/graphics.c
@@ -857,17 +857,6 @@ void graphics_image_free(struct graphics *gra, struct graphics_image *img)
  * @returns <>
  * @author Martin Schaller (04/2008)
 */
-void graphics_draw_restore(struct graphics *this_, struct point *p, int w, int h)
-{
-	this_->meth.draw_restore(this_->priv, p, w, h);
-}
-
-/**
- * FIXME
- * @param <>
- * @returns <>
- * @author Martin Schaller (04/2008)
-*/
 void graphics_draw_mode(struct graphics *this_, enum draw_mode_num mode)
 {
 	this_->meth.draw_mode(this_->priv, mode);
diff --git a/navit/graphics.h b/navit/graphics.h
index 4438fa66..d41c31f7 100644
--- a/navit/graphics.h
+++ b/navit/graphics.h
@@ -69,7 +69,6 @@ struct graphics_methods {
 	void (*draw_text)(struct graphics_priv *gr, struct graphics_gc_priv *fg, struct graphics_gc_priv *bg, struct graphics_font_priv *font, char *text, struct point *p, int dx, int dy);
 	void (*draw_image)(struct graphics_priv *gr, struct graphics_gc_priv *fg, struct point *p, struct graphics_image_priv *img);
 	void (*draw_image_warp)(struct graphics_priv *gr, struct graphics_gc_priv *fg, struct point *p, int count, struct graphics_image_priv *img);
-	void (*draw_restore)(struct graphics_priv *gr, struct point *p, int w, int h);
 	void (*draw_drag)(struct graphics_priv *gr, struct point *p);
 	struct graphics_font_priv *(*font_new)(struct graphics_priv *gr, struct graphics_font_methods *meth, char *font,  int size, int flags);
 	struct graphics_gc_priv *(*gc_new)(struct graphics_priv *gr, struct graphics_gc_methods *meth);
@@ -174,7 +173,6 @@ struct graphics_image *graphics_image_new_scaled(struct graphics *gra, char *pat
 struct graphics_image *graphics_image_new_scaled_rotated(struct graphics *gra, char *path, int w, int h, int rotate);
 struct graphics_image *graphics_image_new(struct graphics *gra, char *path);
 void graphics_image_free(struct graphics *gra, struct graphics_image *img);
-void graphics_draw_restore(struct graphics *this_, struct point *p, int w, int h);
 void graphics_draw_mode(struct graphics *this_, enum draw_mode_num mode);
 void graphics_draw_lines(struct graphics *this_, struct graphics_gc *gc, struct point *p, int count);
 void graphics_draw_circle(struct graphics *this_, struct graphics_gc *gc, struct point *p, int r);
diff --git a/navit/graphics/android/graphics_android.c b/navit/graphics/android/graphics_android.c
index 498779b6..f01fb260 100644
--- a/navit/graphics/android/graphics_android.c
+++ b/navit/graphics/android/graphics_android.c
@@ -373,11 +373,6 @@ draw_image(struct graphics_priv *gra, struct graphics_gc_priv *fg, struct point
 	
 }
 
-static void
-draw_restore(struct graphics_priv *gr, struct point *p, int w, int h)
-{
-}
-
 static void draw_drag(struct graphics_priv *gra, struct point *p)
 {
 	(*jnienv)->CallVoidMethod(jnienv, gra->NavitGraphics, gra->NavitGraphics_draw_drag, p ? p->x : 0, p ? p->y : 0);
@@ -458,7 +453,6 @@ static struct graphics_methods graphics_methods = {
 	draw_text,
 	draw_image,
 	NULL,
-	draw_restore,
 	draw_drag,
 	font_new,
 	gc_new,
diff --git a/navit/graphics/cocoa/graphics_cocoa.m b/navit/graphics/cocoa/graphics_cocoa.m
index d5fe1027..5bccd346 100644
--- a/navit/graphics/cocoa/graphics_cocoa.m
+++ b/navit/graphics/cocoa/graphics_cocoa.m
@@ -639,7 +639,6 @@ static struct graphics_methods graphics_methods = {
 	draw_text, 
 	draw_image,
 	NULL, /* draw_image_warp, */
-	NULL, /* draw_restore, */
 	draw_drag,
 	font_new,
 	gc_new,
diff --git a/navit/graphics/gd/graphics_gd.c b/navit/graphics/gd/graphics_gd.c
index 0d39b470..06d63ac2 100644
--- a/navit/graphics/gd/graphics_gd.c
+++ b/navit/graphics/gd/graphics_gd.c
@@ -467,11 +467,6 @@ draw_image(struct graphics_priv *gr, struct graphics_gc_priv *fg, struct point *
 }
 
 static void
-draw_restore(struct graphics_priv *gr, struct point *p, int w, int h)
-{
-}
-
-static void
 draw_drag(struct graphics_priv *gr, struct point *p)
 {
 	if (p)
@@ -806,7 +801,6 @@ static struct graphics_methods graphics_methods = {
 	draw_text,
 	draw_image,
 	NULL,
-	draw_restore,
 	draw_drag,
 	NULL,
 	gc_new,
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 18ca1436..8d75415c 100644
--- a/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c
+++ b/navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c
@@ -601,17 +601,6 @@ overlay_draw(struct graphics_priv *parent, struct graphics_priv *overlay, GdkRec
 }
 
 static void
-draw_restore(struct graphics_priv *gr, struct point *p, int w, int h)
-{
-	GtkWidget *widget=gr->widget;
-	gdk_draw_drawable(widget->window,
-                        widget->style->fg_gc[GTK_WIDGET_STATE(widget)],
-                        gr->drawable,
-                        p->x, p->y, p->x, p->y, w, h);
-
-}
-
-static void
 draw_drag(struct graphics_priv *gr, struct point *p)
 {
 	if (!gr->cleanup) {
@@ -1155,7 +1144,6 @@ static struct graphics_methods graphics_methods = {
 #else
 	NULL,
 #endif
-	draw_restore,
 	draw_drag,
 	NULL, /* font_new */
 	gc_new,
diff --git a/navit/graphics/null/graphics_null.c b/navit/graphics/null/graphics_null.c
index 7b027036..22909f7b 100644
--- a/navit/graphics/null/graphics_null.c
+++ b/navit/graphics/null/graphics_null.c
@@ -150,11 +150,6 @@ draw_image(struct graphics_priv *gr, struct graphics_gc_priv *fg, struct point *
 {
 }
 
-static void
-draw_restore(struct graphics_priv *gr, struct point *p, int w, int h)
-{
-}
-
 static void draw_drag(struct graphics_priv *gr, struct point *p)
 {
 }
@@ -230,7 +225,6 @@ static struct graphics_methods graphics_methods = {
 	draw_text,
 	draw_image,
 	NULL,
-	draw_restore,
 	draw_drag,
 	font_new,
 	gc_new,
diff --git a/navit/graphics/opengl/graphics_opengl.c b/navit/graphics/opengl/graphics_opengl.c
index 8e666f51..5d65d1cd 100644
--- a/navit/graphics/opengl/graphics_opengl.c
+++ b/navit/graphics/opengl/graphics_opengl.c
@@ -1084,11 +1084,6 @@ draw_image(struct graphics_priv *gr, struct graphics_gc_priv *fg,
 }
 
 static void
-draw_restore(struct graphics_priv *gr, struct point *p, int w, int h)
-{
-}
-
-static void
 draw_drag(struct graphics_priv *gr, struct point *p)
 {
 
@@ -1427,7 +1422,6 @@ static struct graphics_methods graphics_methods = {
 	draw_text,
 	draw_image,
 	NULL,
-	draw_restore,
 	draw_drag,
 	NULL,
 	gc_new,
diff --git a/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp b/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp
index a8217016..21ff837d 100644
--- a/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp
+++ b/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp
@@ -459,16 +459,6 @@ static void draw_image(struct graphics_priv *gr, struct graphics_gc_priv *fg, st
 	gr->painter->drawPixmap(p->x, p->y, *img->pixmap);
 }
 
-//##############################################################################################################
-//# Description: 
-//# Comment: 
-//# Authors: Martin Schaller (04/2008)
-//##############################################################################################################
-static void draw_restore(struct graphics_priv *gr, struct point *p, int w, int h)
-{
-}
-
-
 static void
 draw_drag(struct graphics_priv *gr, struct point *p)
 {
@@ -694,7 +684,6 @@ static struct graphics_methods graphics_methods = {
 	draw_text,
 	draw_image,
 	NULL,
-	draw_restore,
 	draw_drag,
 	font_new,
 	gc_new,
diff --git a/navit/graphics/sdl/graphics_sdl.c b/navit/graphics/sdl/graphics_sdl.c
index 64e9a3d1..95a6a704 100644
--- a/navit/graphics/sdl/graphics_sdl.c
+++ b/navit/graphics/sdl/graphics_sdl.c
@@ -780,12 +780,6 @@ draw_image(struct graphics_priv *gr, struct graphics_gc_priv *fg, struct point *
 }
 
 static void
-draw_restore(struct graphics_priv *gr, struct point *p, int w, int h)
-{
-    dbg(lvl_debug, "draw_restore\n");
-}
-
-static void
 background_gc(struct graphics_priv *gr, struct graphics_gc_priv *gc)
 {
     dbg(lvl_debug, "background_gc\n");
@@ -903,7 +897,6 @@ static struct graphics_methods graphics_methods = {
     draw_text,
     draw_image,
     NULL, /*draw_image_warp */
-    draw_restore,
     draw_drag,
     NULL, /* font_new */
     gc_new,
diff --git a/navit/graphics/win32/graphics_win32.c b/navit/graphics/win32/graphics_win32.c
index 038aa59f..f49e7ce9 100644
--- a/navit/graphics/win32/graphics_win32.c
+++ b/navit/graphics/win32/graphics_win32.c
@@ -912,12 +912,6 @@ static void draw_circle(struct graphics_priv *gr, struct graphics_gc_priv *gc, s
 }
 
 
-
-static void draw_restore(struct graphics_priv *gr, struct point *p, int w, int h)
-{
-    InvalidateRect( gr->wnd_handle, NULL, FALSE );
-}
-
 static void draw_drag(struct graphics_priv *gr, struct point *p)
 {
     if ( p )
@@ -1578,7 +1572,6 @@ static struct graphics_methods graphics_methods =
 #else
     NULL,
 #endif
-    draw_restore,
     draw_drag,
     font_new,
     gc_new,