Hello all,
If HAVE_ELEMENTARY_EMAP is not defined, elementary does not compile.
I commented out some parts, added some semicolons and fixed some
spellings to get it compiled.
What I did is attached just for reference, as I did not check if it
affects when HAVE_ELEMENTARY_EMAP
is defined...
Thanks.
brian
--
brian
------------------
Cool-Karaoke - The smallest recording studio, in your palm, open-sourced
http://cool-idea.com.tw/
iMaGiNaTiOn iS mOrE iMpOrTaNt tHaN kNoWlEdGe
Index: src/lib/elm_map.c
===================================================================
--- src/lib/elm_map.c (revision 74962)
+++ src/lib/elm_map.c (working copy)
@@ -3880,6 +3880,7 @@
static void
_elm_map_smart_add(Evas_Object *obj)
{
+#ifdef HAVE_ELEMENTARY_ECORE_CON
Evas_Coord minw, minh;
Elm_Map_Pan_Smart_Data *pan_data;
@@ -3985,11 +3986,13 @@
if (!ecore_file_download_protocol_available("http://";))
ERR("Ecore must be built with curl support for the map widget!");
+#endif
}
static void
_elm_map_smart_del(Evas_Object *obj)
{
+#ifdef HAVE_ELEMENTARY_ECORE_CON
Elm_Map_Route *r;
Elm_Map_Name *na;
Delayed_Data *dd;
@@ -4063,6 +4066,7 @@
if (sd->map) evas_map_free(sd->map);
ELM_WIDGET_CLASS(_elm_map_parent_sc)->base.del(obj);
+#endif
}
static void
@@ -4070,11 +4074,13 @@
Evas_Coord x,
Evas_Coord y)
{
+#ifdef HAVE_ELEMENTARY_ECORE_CON
ELM_MAP_DATA_GET(obj, sd);
ELM_WIDGET_CLASS(_elm_map_parent_sc)->base.move(obj, x, y);
evas_object_move(sd->hit_rect, x, y);
+#endif
}
static void
@@ -4082,28 +4088,33 @@
Evas_Coord w,
Evas_Coord h)
{
+#ifdef HAVE_ELEMENTARY_ECORE_CON
ELM_MAP_DATA_GET(obj, sd);
ELM_WIDGET_CLASS(_elm_map_parent_sc)->base.resize(obj, w, h);
evas_object_resize(sd->hit_rect, w, h);
+#endif
}
static void
_elm_map_smart_member_add(Evas_Object *obj,
Evas_Object *member)
{
+#ifdef HAVE_ELEMENTARY_ECORE_CON
ELM_MAP_DATA_GET(obj, sd);
ELM_WIDGET_CLASS(_elm_map_parent_sc)->base.member_add(obj, member);
if (sd->hit_rect)
evas_object_raise(sd->hit_rect);
+#endif
}
static void
_elm_map_smart_set_user(Elm_Map_Smart_Class *sc)
{
+#ifdef HAVE_ELEMENTARY_ECORE_CON
ELM_WIDGET_CLASS(sc)->base.add = _elm_map_smart_add;
ELM_WIDGET_CLASS(sc)->base.del = _elm_map_smart_del;
ELM_WIDGET_CLASS(sc)->base.move = _elm_map_smart_move;
@@ -4113,11 +4124,13 @@
ELM_WIDGET_CLASS(sc)->on_focus = _elm_map_smart_on_focus;
ELM_WIDGET_CLASS(sc)->theme = _elm_map_smart_theme;
ELM_WIDGET_CLASS(sc)->event = _elm_map_smart_event;
+#endif
}
EAPI const Elm_Map_Smart_Class *
elm_map_smart_class_get(void)
{
+#ifdef HAVE_ELEMENTARY_ECORE_CON
static Elm_Map_Smart_Class _sc =
ELM_MAP_SMART_CLASS_INIT_NAME_VERSION(ELM_MAP_SMART_NAME);
static const Elm_Map_Smart_Class *class = NULL;
@@ -4130,6 +4143,9 @@
class = &_sc;
return class;
+#else
+ return NULL;
+#endif
}
EAPI Evas_Object *
@@ -5396,7 +5412,7 @@
evas_object_smart_changed(overlay->wsd->pan_obj);
#else
(void)overlay;
- (void)obj;
+ (void)content;
#endif
}
@@ -5697,7 +5713,7 @@
ovl = grp->ovl;
return ovl->members;
#else
- (void)clas;
+ (void)grp;
return OVERLAY_CLASS_ZOOM_MAX;
#endif
}
@@ -5860,8 +5876,8 @@
#else
(void)obj;
(void)flon;
- (void)flat
- (void) tlon;
+ (void)flat;
+ (void)tlon;
(void)tlat;
return NULL;
#endif
@@ -5917,7 +5933,7 @@
#else
(void)overlay;
(void)lon;
- (void)lat
+ (void)lat;
#endif
}
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
