--- trunk/src/osm-gps-map.h	2009/08/23 19:38:15	73
+++ trunk/src/osm-gps-map.h	2009/08/24 12:57:15	75
@@ -100,12 +100,10 @@
 /* the osd structure mainly contains various callbacks */
 /* required to draw and update the OSD */
 typedef struct osm_gps_map_osd_s {
-    GdkPixmap *pixmap;   // the main pixmap (to draw on it)
     GtkWidget *widget;   // the main map widget (to get its stlye info)
 
     void(*render)(struct osm_gps_map_osd_s *);
-    void(*draw)(struct osm_gps_map_osd_s *, gint, gint);
-    void(*restore)(struct osm_gps_map_osd_s *) ;
+    void(*draw)(struct osm_gps_map_osd_s *, GdkDrawable *);
     osd_button_t(*check)(gint, gint);       /* check if x/y lies within OSD */
     void(*free)(struct osm_gps_map_osd_s *);
 
@@ -137,7 +135,6 @@
 void osm_gps_map_add_image (OsmGpsMap *map, float latitude, float longitude, GdkPixbuf *image);
 gboolean osm_gps_map_remove_image (OsmGpsMap *map, GdkPixbuf *image);
 void osm_gps_map_clear_images (OsmGpsMap *map);
-void osm_gps_map_osd_speed (OsmGpsMap *map, float speed);
 void osm_gps_map_draw_gps (OsmGpsMap *map, float latitude, float longitude, float heading);
 void osm_gps_map_clear_gps (OsmGpsMap *map);
 coord_t osm_gps_map_get_co_ordinates (OsmGpsMap *map, int pixel_x, int pixel_y);