Fix:Tickets 141 & 182:Make fonts configurable from the xml file, and change default fonts to Sans instead of Mono. Thanks Sarah & Nekohayo for the patches

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

1 files changed, 2 insertions, 1 deletions

diff --git a/navit/graphics.h b/navit/graphics.h
index 1a5d1d994..cb462caa8 100644
--- a/navit/graphics.h
+++ b/navit/graphics.h
@@ -56,7 +56,7 @@ struct graphics_methods {
 	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, char *data);
 	void (*draw_restore)(struct graphics_priv *gr, struct point *p, int w, int h);
-	struct graphics_font_priv *(*font_new)(struct graphics_priv *gr, struct graphics_font_methods *meth, int size, int flags);
+	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);
 	void (*background_gc)(struct graphics_priv *gr, struct graphics_gc_priv *gc);
 	struct graphics_priv *(*overlay_new)(struct graphics_priv *gr, struct graphics_methods *meth, struct point *p, int w, int h);
@@ -133,6 +133,7 @@ void graphics_register_button_callback(struct graphics *this_, void (*callback)(
 void graphics_register_motion_callback(struct graphics *this_, void (*callback)(void *data, struct point *p), void *data);
 void graphics_register_keypress_callback(struct graphics *this_, void (*callback)(void *data, char *key), void *data);
 struct graphics_font *graphics_font_new(struct graphics *gra, int size, int flags);
+void graphics_font_destroy_all(struct graphics *gra); 
 struct graphics_gc *graphics_gc_new(struct graphics *gra);
 void graphics_gc_destroy(struct graphics_gc *gc);
 void graphics_gc_set_foreground(struct graphics_gc *gc, struct color *c);