summaryrefslogtreecommitdiff
path: root/navit/gui
diff options
context:
space:
mode:
authormartin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220>2013-01-19 18:56:41 +0000
committermartin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220>2013-01-19 18:56:41 +0000
commit2d29d64f234eb731550f88b6b8007ea38d060da2 (patch)
treed82deab6a23f8cc81cc7bb1d618e465431df0991 /navit/gui
parent55f4463abda76761be9e0fa284ad96d56916a51d (diff)
downloadnavit-2d29d64f234eb731550f88b6b8007ea38d060da2.tar.gz
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
Diffstat (limited to 'navit/gui')
-rw-r--r--navit/gui/gtk/gui_gtk_window.c1
-rw-r--r--navit/gui/internal/gui_internal.c3
-rw-r--r--navit/gui/internal/gui_internal_command.c1
-rw-r--r--navit/gui/internal/gui_internal_poi.c1
4 files changed, 4 insertions, 2 deletions
diff --git a/navit/gui/gtk/gui_gtk_window.c b/navit/gui/gtk/gui_gtk_window.c
index b725cf944..e9e55551a 100644
--- a/navit/gui/gtk/gui_gtk_window.c
+++ b/navit/gui/gtk/gui_gtk_window.c
@@ -29,6 +29,7 @@
#include <gtk/gtk.h>
#include "config.h"
#include "item.h"
+#include "xmlconfig.h"
#include "navit.h"
#include "debug.h"
#include "gui.h"
diff --git a/navit/gui/internal/gui_internal.c b/navit/gui/internal/gui_internal.c
index bd1da6e21..b39fbfa0a 100644
--- a/navit/gui/internal/gui_internal.c
+++ b/navit/gui/internal/gui_internal.c
@@ -41,6 +41,7 @@
#include <sys/time.h>
#endif /* _MSC_VER */
#include "item.h"
+#include "xmlconfig.h"
#include "file.h"
#include "navit.h"
#include "navit_nls.h"
@@ -52,7 +53,6 @@
#include "transform.h"
#include "color.h"
#include "map.h"
-#include "layout.h"
#include "callback.h"
#include "vehicle.h"
#include "vehicleprofile.h"
@@ -70,7 +70,6 @@
#include "navigation.h"
#include "gui_internal.h"
#include "command.h"
-#include "xmlconfig.h"
#include "util.h"
#include "bookmarks.h"
#include "linguistics.h"
diff --git a/navit/gui/internal/gui_internal_command.c b/navit/gui/internal/gui_internal_command.c
index 99350089c..be11e576a 100644
--- a/navit/gui/internal/gui_internal_command.c
+++ b/navit/gui/internal/gui_internal_command.c
@@ -15,6 +15,7 @@
#include "navit_nls.h"
#include "command.h"
#include "attr.h"
+#include "xmlconfig.h"
#include "event.h"
#include "config_.h"
#include "map.h"
diff --git a/navit/gui/internal/gui_internal_poi.c b/navit/gui/internal/gui_internal_poi.c
index be59201b3..5cfdc9e39 100644
--- a/navit/gui/internal/gui_internal_poi.c
+++ b/navit/gui/internal/gui_internal_poi.c
@@ -9,6 +9,7 @@
#include "navit.h"
#include "navit_nls.h"
#include "item.h"
+#include "xmlconfig.h"
#include "map.h"
#include "mapset.h"
#include "layout.h"