Revert differences with upstream

diff --git a/src/lib/elm_main.c b/src/lib/elm_main.c
index 86157db..4cc2453 100644 (file)
--- a/src/lib/elm_main.c
+++ b/src/lib/elm_main.c
@@ -918,6 +918,10 @@ elm_object_mirrored_automatic_set(Evas_Object *obj, Eina_Bool automatic)
    elm_widget_mirrored_automatic_set(obj, automatic);
 }
 
+/**
+ * @}
+ */
+
 EAPI void
 elm_object_scale_set(Evas_Object *obj,
                      double       scale)
@@ -2121,7 +2125,7 @@ elm_object_signal_emit(Evas_Object *obj,
 }
 
 EAPI void
-elm_object_signal_callback_add(Evas_Object *obj, const char *emission, const char *source, void (*func) (void *data, Evas_Object *o, const char *emission, const char *source), void *data)
+elm_object_signal_callback_add(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func, void *data)
 {
     EINA_SAFETY_ON_NULL_RETURN(obj);
     EINA_SAFETY_ON_NULL_RETURN(func);
@@ -2129,7 +2133,7 @@ elm_object_signal_callback_add(Evas_Object *obj, const char *emission, const cha
 }
 
 EAPI void *
-elm_object_signal_callback_del(Evas_Object *obj, const char *emission, const char *source, void (*func) (void *data, Evas_Object *o, const char *emission, const char *source))
+elm_object_signal_callback_del(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func)
 {
     EINA_SAFETY_ON_NULL_RETURN_VAL(obj, NULL);
     EINA_SAFETY_ON_NULL_RETURN_VAL(func, NULL);
@@ -2201,7 +2205,7 @@ elm_object_item_content_part_set(Elm_Object_Item *it,
                                  const char *part,
                                  Evas_Object *content)
 {
-   elm_widget_item_content_part_set(it, part, content);
+   _elm_widget_item_content_part_set((Elm_Widget_Item *) it, part, content);
 }
 
 EAPI void
@@ -2216,7 +2220,7 @@ EAPI Evas_Object *
 elm_object_item_content_part_get(const Elm_Object_Item *it,
                                  const char *part)
 {
-   return elm_widget_item_content_part_get(it, part);
+   return _elm_widget_item_content_part_get((Elm_Widget_Item *) it, part);
 }
 
 EAPI Evas_Object *
@@ -2229,7 +2233,7 @@ elm_object_item_part_content_get(const Elm_Object_Item *it,
 EAPI Evas_Object *
 elm_object_item_content_part_unset(Elm_Object_Item *it, const char *part)
 {
-   return elm_widget_item_content_part_unset(it, part);
+   return _elm_widget_item_content_part_unset((Elm_Widget_Item *) it, part);
 }
 
 EAPI Evas_Object *
@@ -2243,7 +2247,7 @@ elm_object_item_text_part_set(Elm_Object_Item *it,
                               const char *part,
                               const char *label)
 {
-   elm_widget_item_text_part_set(it, part, label);
+   _elm_widget_item_text_part_set((Elm_Widget_Item *) it, part, label);
 }
 
 EAPI void
@@ -2257,7 +2261,7 @@ elm_object_item_part_text_set(Elm_Object_Item *it,
 EAPI const char *
 elm_object_item_text_part_get(const Elm_Object_Item *it, const char *part)
 {
-   return elm_widget_item_text_part_get(it, part);
+   return _elm_widget_item_text_part_get((Elm_Widget_Item *) it, part);
 }
 
 EAPI const char *
@@ -2266,34 +2270,34 @@ elm_object_item_part_text_get(const Elm_Object_Item *it, const char *part)
    return _elm_widget_item_text_part_get((Elm_Widget_Item *) it, part);
 }
 
-EAPI void *
-elm_object_item_data_get(const Elm_Object_Item *it)
+EAPI void
+elm_object_access_info_set(Evas_Object *obj, const char *txt)
 {
-   return elm_widget_item_data_get(it);
+   elm_widget_access_info_set(obj, txt);
 }
 
 EAPI void
-elm_object_item_data_set(Elm_Object_Item *it, void *data)
+elm_object_item_access_info_set(Elm_Object_Item *it, const char *txt)
 {
-   elm_widget_item_data_set(it, data);
+   _elm_widget_item_access_info_set((Elm_Widget_Item *) it, txt);
 }
 
-EAPI void
-elm_object_item_signal_emit(Elm_Object_Item *it, const char *emission, const char *source)
+EAPI void *
+elm_object_item_data_get(const Elm_Object_Item *it)
 {
-   elm_widget_item_signal_emit(it, emission, source);
+   return elm_widget_item_data_get(it);
 }
 
 EAPI void
-elm_object_access_info_set(Evas_Object *obj, const char *txt)
+elm_object_item_data_set(Elm_Object_Item *it, void *data)
 {
-   elm_widget_access_info_set(obj, txt);
+   elm_widget_item_data_set(it, data);
 }
 
 EAPI void
-elm_object_item_access_info_set(Elm_Object_Item *it, const char *txt)
+elm_object_item_signal_emit(Elm_Object_Item *it, const char *emission, const char *source)
 {
-   _elm_widget_item_access_info_set((Elm_Widget_Item *)it, txt);
+   _elm_widget_item_signal_emit((Elm_Widget_Item *) it, emission, source);
 }
 
 EAPI void elm_object_item_disabled_set(Elm_Object_Item *it, Eina_Bool disabled)

diff --git a/src/lib/elm_widget.h b/src/lib/elm_widget.h
index 87158d7..6cb400c 100644 (file)
--- a/src/lib/elm_widget.h
+++ b/src/lib/elm_widget.h
@@ -593,42 +593,6 @@ EAPI void             elm_widget_tree_dot_dump(const Evas_Object *top, FILE *out
 #define elm_widget_item_cursor_engine_only_get(item) \
   _elm_widget_item_cursor_engine_only_get((const Elm_Widget_Item *)item)
 /**
- * Convenience function to query item's content part set.
- * @see _elm_widget_item_content_part_set()
- */
-#define elm_widget_item_content_part_set(item, part, content) \
-  _elm_widget_item_content_part_set((Elm_Widget_Item *)item, part, content)
-/**
- * Convenience function to query item's content part get.
- * @see _elm_widget_item_content_part_get()
- */
-#define elm_widget_item_content_part_get(item, part) \
-  _elm_widget_item_content_part_get((const Elm_Widget_Item *)item, part)
-/**
- * Convenience function to query item's content part unset.
- * @see _elm_widget_item_content_part_unset()
- */
-#define elm_widget_item_content_part_unset(item, part) \
-  _elm_widget_item_content_part_unset((Elm_Widget_Item *)item, part)
-/**
- * Convenience function to query item's text part set.
- * @see _elm_widget_item_text_part_set()
- */
-#define elm_widget_item_text_part_set(item, part, label) \
-  _elm_widget_item_text_part_set((Elm_Widget_Item *)item, part, label)
-/**
- * Convenience function to query item's text part get.
- * @see _elm_widget_item_text_part_get()
- */
-#define elm_widget_item_text_part_get(item, part) \
-  _elm_widget_item_text_part_get((const Elm_Widget_Item *)item, part)
-/**
- * Convenience function to query item's signal emit.
- * @see _elm_widget_item_signal_emit()
- */
-#define elm_widget_item_signal_emit(item, emission, source) \
-  _elm_widget_item_signal_emit((Elm_Widget_Item *)item, emission, source)
-/**
  * Convenience function to query item's content set hook.
  * @see _elm_widget_item_content_set_hook_set()
  */
@@ -716,7 +680,7 @@ EAPI Eina_Bool        _elm_widget_item_disabled_get(const Elm_Widget_Item *item)
    if (!elm_widget_is_check(obj)) return
 
 #define ELM_CHECK_WIDTYPE(obj, widtype) \
-   if (!elm_widget_type_check((obj), (widtype), __func__)) return
+   if (!obj || !elm_widget_type_check((obj), (widtype), __func__)) return
 
 #define ELM_WIDGET_ITEM_WIDTYPE_CHECK_OR_RETURN(it, ...)                \
    ELM_WIDGET_ITEM_CHECK_OR_RETURN((Elm_Widget_Item *)it, __VA_ARGS__); \