Add:Core:Allow layer tag to reference layers within navit context, object handling cleanup

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

1 files changed, 16 insertions, 1 deletions

diff --git a/navit/layout.h b/navit/layout.h
index 1f36459d0..a17d8e279 100644
--- a/navit/layout.h
+++ b/navit/layout.h
@@ -75,10 +75,13 @@ struct itemgra {
 };
 
 struct layer { 
+	NAVIT_OBJECT
+	struct navit *navit;
 	char *name;
 	int details;
 	GList *itemgras;
 	int active;
+	struct layer *ref;
 };
 
 struct cursor {
@@ -89,7 +92,19 @@ struct cursor {
 	int interval;
 };
 
-struct layout { char *name; char* dayname; char* nightname; char *font; struct color color; GList *layers; GList *cursors; int order_delta; int active; };
+struct layout {
+	NAVIT_OBJECT
+	struct navit *navit;
+	char *name;
+	char* dayname;
+	char* nightname;
+	char *font;
+	struct color color;
+	GList *layers;
+	GList *cursors;
+	int order_delta;
+	int active;
+};
 
 /* prototypes */
 enum attr_type;