elementary/elm_widget_item - wrapped the elm_widget_item with elm_object_item

But wonder, is it really needed the auto casting macros?

Why user not just use the elm_widget_item directly
and make their item data structures dangled to elm_widget_item just like smart object?

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@62079 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in
index 2925c37..af4016c 100644 (file)
--- a/src/lib/Elementary.h.in
+++ b/src/lib/Elementary.h.in
@@ -346,7 +346,7 @@ extern "C" {
     * An Elementary Object item handle.
     * @ingroup General
     */
-   typedef struct _Elm_Widget_Item Elm_Object_Item;
+   typedef struct _Elm_Object_Item Elm_Object_Item;
 
    /**
     * Called back when a widget's tooltip is activated and needs content.

diff --git a/src/lib/elm_widget.c b/src/lib/elm_widget.c
index 544ba57..56e773a 100644 (file)
--- a/src/lib/elm_widget.c
+++ b/src/lib/elm_widget.c
@@ -2933,7 +2933,7 @@ _elm_widget_item_content_part_set(Elm_Widget_Item *item,
 
 EAPI Evas_Object *
 _elm_widget_item_content_part_get(const Elm_Widget_Item *item,
-                                 const char *part)
+                                  const char *part)
 {
    ELM_WIDGET_ITEM_CHECK_OR_RETURN(item, NULL);
    if (!item->on_content_get_func) return NULL;
@@ -2942,7 +2942,7 @@ _elm_widget_item_content_part_get(const Elm_Widget_Item *item,
 
 EAPI Evas_Object *
 _elm_widget_item_content_part_unset(Elm_Widget_Item *item,
-                                   const char *part)
+                                    const char *part)
 {
    ELM_WIDGET_ITEM_CHECK_OR_RETURN(item, NULL);
    if (!item->on_content_unset_func) return NULL;
@@ -2961,7 +2961,7 @@ _elm_widget_item_text_part_set(Elm_Widget_Item *item,
 
 EAPI const char *
 _elm_widget_item_text_part_get(const Elm_Widget_Item *item,
-                              const char *part)
+                               const char *part)
 {
    ELM_WIDGET_ITEM_CHECK_OR_RETURN(item, NULL);
    if (!item->on_text_get_func) return NULL;

diff --git a/src/lib/elm_widget.h b/src/lib/elm_widget.h
index beae803..873d568 100644 (file)
--- a/src/lib/elm_widget.h
+++ b/src/lib/elm_widget.h
@@ -218,6 +218,11 @@ struct _Elm_Widget_Item
    /* @todo: TODO check if this is enough for 1.0 release, maybe add padding! */
 };
 
+struct _Elm_Object_Item
+{
+   Elm_Widget_Item it;
+};
+
 #define ELM_NEW(t) calloc(1, sizeof(t))
 
 EAPI Eina_Bool        elm_widget_api_check(int ver);
@@ -356,11 +361,11 @@ EAPI void             _elm_widget_item_cursor_style_set(Elm_Widget_Item *item, c
 EAPI const char      *_elm_widget_item_cursor_style_get(const Elm_Widget_Item *item);
 EAPI void             _elm_widget_item_cursor_engine_only_set(Elm_Widget_Item *item, Eina_Bool engine_only);
 EAPI Eina_Bool        _elm_widget_item_cursor_engine_only_get(const Elm_Widget_Item *item);
-EAPI void             _elm_widget_item_content_part_set(Elm_Object_Item *item, const char *part, Evas_Object *content);
-EAPI Evas_Object     *_elm_widget_item_content_part_get(const Elm_Object_Item *item, const char *part);
-EAPI Evas_Object     *_elm_widget_item_content_part_unset(Elm_Object_Item *item, const char *part);
-EAPI void             _elm_widget_item_text_part_set(Elm_Object_Item *item, const char *part, const char *label);
-EAPI const char      *_elm_widget_item_text_part_get(const Elm_Object_Item *item, const char *part);
+EAPI void             _elm_widget_item_content_part_set(Elm_Widget_Item *item, const char *part, Evas_Object *content);
+EAPI Evas_Object     *_elm_widget_item_content_part_get(const Elm_Widget_Item *item, const char *part);
+EAPI Evas_Object     *_elm_widget_item_content_part_unset(Elm_Widget_Item *item, const char *part);
+EAPI void             _elm_widget_item_text_part_set(Elm_Widget_Item *item, const char *part, const char *label);
+EAPI const char      *_elm_widget_item_text_part_get(const Elm_Widget_Item *item, const char *part);
 
 
 /* debug function. don't use it unless you are tracking parenting issues */