elm: do not include config.h

git-svn-id: https://svn.enlightenment.org/svn/e/trunk/elementary@60687 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/bin/test_map.c b/src/bin/test_map.c
index 33ba698..7b9d7c3 100644 (file)
--- a/src/bin/test_map.c
+++ b/src/bin/test_map.c
@@ -59,7 +59,7 @@ my_map_gpx_fileselector_done(void *data, Evas_Object *obj __UNUSED__, void *even
    if (selected)
      {
         printf("Selected file: %s\n", selected);
-#ifdef HAVE_ELEMENTARY_EMAP
+#ifdef ELM_EMAP
         EMap_Route *emap = emap_route_gpx_new(selected);
         track = elm_map_track_add(data, emap);
 #else

diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in
index 803e8b8..283f735 100644 (file)
--- a/src/lib/Elementary.h.in
+++ b/src/lib/Elementary.h.in
@@ -94,14 +94,11 @@ Pants
 @ELM_EDBUS_DEF@ ELM_EDBUS
 @ELM_EFREET_DEF@ ELM_EFREET
 @ELM_ETHUMB_DEF@ ELM_ETHUMB
+@ELM_EMAP_DEF@ ELM_EMAP
 @ELM_DEBUG_DEF@ ELM_DEBUG
 @ELM_ALLOCA_H_DEF@ ELM_ALLOCA_H
 @ELM_LIBINTL_H_DEF@ ELM_LIBINTL_H
 
-#ifdef HAVE_CONFIG_H
-# include "elementary_config.h"
-#endif
-
 /* Standard headers for standard system calls etc. */
 #include <stdio.h>
 #include <stdlib.h>
@@ -168,7 +165,7 @@ Pants
 # include <Ethumb_Client.h>
 #endif
 
-#ifdef HAVE_ELEMENTARY_EMAP
+#ifdef ELM_EMAP
 # include <EMap.h>
 #endif
 
@@ -4170,8 +4167,9 @@ EAPI Elm_Genlist_Item *elm_genlist_item_sorted_insert(Evas_Object *obj, const El
    EAPI void                  elm_map_rotate_get(const Evas_Object *obj, double *degree, Evas_Coord *cx, Evas_Coord *cy) EINA_ARG_NONNULL(1, 2, 3, 4);
    EAPI void                  elm_map_wheel_disabled_set(Evas_Object *obj, Eina_Bool disabled) EINA_ARG_NONNULL(1);
    EAPI Eina_Bool             elm_map_wheel_disabled_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
-#ifdef HAVE_ELEMENTARY_EMAP
+#ifdef ELM_EMAP
    EAPI Elm_Map_Track        *elm_map_track_add(Evas_Object *obj, EMap_Route *emap) EINA_ARG_NONNULL(1);
+   EAPI EMap_Route              *elm_map_track_emap_get(Elm_Map_Track *track) EINA_ARG_NONNULL(1);
 #endif
    EAPI void                  elm_map_track_remove(Elm_Map_Track *track) EINA_ARG_NONNULL(1);
    EAPI void                  elm_map_track_color_set(Elm_Map_Track *track, int r, int g , int b, int a) EINA_ARG_NONNULL(1);

diff --git a/src/lib/elm_map.c b/src/lib/elm_map.c
index 8b50c54..11d00d5 100644 (file)
--- a/src/lib/elm_map.c
+++ b/src/lib/elm_map.c
@@ -291,7 +291,7 @@ struct _Elm_Map_Track
 {
    Widget_Data *wd;
 
-#ifdef HAVE_ELEMENTARY_EMAP
+#ifdef ELM_EMAP
    EMap_Route *emap;
 #endif
 
@@ -831,7 +831,7 @@ obj_rotate_zoom(void *data, Evas_Object *obj)
 static void
 track_place(Evas_Object *obj, Grid *g __UNUSED__, Evas_Coord px, Evas_Coord py, Evas_Coord ox __UNUSED__, Evas_Coord oy __UNUSED__, Evas_Coord ow, Evas_Coord oh)
 {
-#ifdef HAVE_ELEMENTARY_EMAP
+#ifdef ELM_EMAP
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
    Eina_List *lr, *lp, *ln;
@@ -5257,7 +5257,7 @@ elm_map_wheel_disabled_get(const Evas_Object *obj)
    return wd->wheel_disabled;
 }
 
-#ifdef HAVE_ELEMENTARY_EMAP
+#ifdef ELM_EMAP
 /**
  * Add a track on the map
  *
@@ -5291,6 +5291,13 @@ elm_map_track_add(Evas_Object *obj, EMap_Route *emap)
 
    return track;
 }
+
+
+EMap_Route
+*elm_map_track_emap_get(Elm_Map_Track *track)
+{
+   return track->emap;
+}
 #endif
 
 /**