Fix:osd:Remove strange, buggy and undocumented code for drawing a box around an OSD item based on attr_flags.

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

2 files changed, 1 insertions, 22 deletions

diff --git a/navit/osd.c b/navit/osd.c
index d47653dc..c4b9299f 100644
--- a/navit/osd.c
+++ b/navit/osd.c
@@ -335,9 +335,6 @@ osd_set_std_attr(struct attr **attrs, struct osd_item *item, int flags)
 	attr=attr_search(attrs, NULL, attr_text_color);
 	if (attr)
 		item->text_color=*attr->u.color;
-	attr=attr_search(attrs, NULL, attr_flags);
-	if (attr)
-		item->attr_flags=attr->u.num;
 	attr=attr_search(attrs, NULL, attr_accesskey);
 	if (attr)
 		item->accesskey = g_strdup(attr->u.str);
@@ -421,28 +418,10 @@ void
 osd_std_draw(struct osd_item *item)
 {
 	struct point p[2];
-	int flags=item->attr_flags;
-
 	graphics_draw_mode(item->gr, draw_mode_begin);
 	p[0].x=0;
 	p[0].y=0;
 	graphics_draw_rectangle(item->gr, item->graphic_bg, p, item->w, item->h);
-	p[1].x=item->w-1;
-	p[1].y=0;
-	if (flags & 1) 
-		graphics_draw_lines(item->gr, item->graphic_fg_text, p, 2);
-	p[0].x=item->w-1;
-	p[0].y=item->h-1;
-	if (flags & 2) 
-		graphics_draw_lines(item->gr, item->graphic_fg_text, p, 2);
-	p[1].x=0;
-	p[1].y=item->h-1;
-	if (flags & 4) 
-		graphics_draw_lines(item->gr, item->graphic_fg_text, p, 2);
-	p[0].x=0;
-	p[0].y=0;
-	if (flags & 8) 
-		graphics_draw_lines(item->gr, item->graphic_fg_text, p, 2);
 }
 
 struct object_func osd_func = {
diff --git a/navit/osd.h b/navit/osd.h
index 851377db..68f96d8d 100644
--- a/navit/osd.h
+++ b/navit/osd.h
@@ -39,7 +39,7 @@ struct osd_item_methods {
 struct osd_item {
 	struct point p;
 	struct osd_item_methods meth;
-	int flags, attr_flags, w, h, fg_line_width, font_size, osd_configuration, configured;
+	int flags, w, h, fg_line_width, font_size, osd_configuration, configured;
 	int rel_w, rel_h, rel_x, rel_y;
 	struct color color_bg, color_white, text_color;
 	struct navit *navit;