elementary/elm_widget - implemented elm_wiget_item_content_set_hook_set series.

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

diff --git a/src/lib/elm_widget.c b/src/lib/elm_widget.c
index 56e773a..b5edcad 100644 (file)
--- a/src/lib/elm_widget.c
+++ b/src/lib/elm_widget.c
@@ -2928,7 +2928,7 @@ _elm_widget_item_content_part_set(Elm_Widget_Item *item,
 {
    ELM_WIDGET_ITEM_CHECK_OR_RETURN(item);
    if (!item->on_content_set_func) return;
-   item->on_content_set_func(item, part, content);
+   item->on_content_set_func((Elm_Object_Item *) item, part, content);
 }
 
 EAPI Evas_Object *
@@ -2937,7 +2937,7 @@ _elm_widget_item_content_part_get(const Elm_Widget_Item *item,
 {
    ELM_WIDGET_ITEM_CHECK_OR_RETURN(item, NULL);
    if (!item->on_content_get_func) return NULL;
-   return item->on_content_get_func(item, part);
+   return item->on_content_get_func((Elm_Object_Item *) item, part);
 }
 
 EAPI Evas_Object *
@@ -2946,7 +2946,7 @@ _elm_widget_item_content_part_unset(Elm_Widget_Item *item,
 {
    ELM_WIDGET_ITEM_CHECK_OR_RETURN(item, NULL);
    if (!item->on_content_unset_func) return NULL;
-   return item->on_content_unset_func(item, part);
+   return item->on_content_unset_func((Elm_Object_Item *) item, part);
 }
 
 EAPI void
@@ -2956,7 +2956,7 @@ _elm_widget_item_text_part_set(Elm_Widget_Item *item,
 {
    ELM_WIDGET_ITEM_CHECK_OR_RETURN(item);
    if (!item->on_text_set_func) return;
-   item->on_text_set_func(item, part, label);
+   item->on_text_set_func((Elm_Object_Item *) item, part, label);
 }
 
 EAPI const char *
@@ -2965,7 +2965,54 @@ _elm_widget_item_text_part_get(const Elm_Widget_Item *item,
 {
    ELM_WIDGET_ITEM_CHECK_OR_RETURN(item, NULL);
    if (!item->on_text_get_func) return NULL;
-   return item->on_text_get_func(item, part);
+   return item->on_text_get_func((Elm_Object_Item *) item, part);
+}
+
+EAPI void
+_elm_widget_item_content_set_hook_set(Elm_Widget_Item *item,
+                                      void (*func)(Elm_Object_Item *it,
+                                                   const char *part,
+                                                   Evas_Object *content))
+{
+   ELM_WIDGET_ITEM_CHECK_OR_RETURN(item);
+   item->on_content_set_func = func;
+}
+
+EAPI void
+_elm_widget_item_content_get_hook_set(Elm_Widget_Item *item,
+                                      Evas_Object *(*func)(const Elm_Object_Item *it,
+                                                           const char *part))
+{
+   ELM_WIDGET_ITEM_CHECK_OR_RETURN(item);
+   item->on_content_get_func = func;
+}
+
+EAPI void
+_elm_widget_item_content_unset_hook_set(Elm_Widget_Item *item,
+                                        Evas_Object *(*func)(Elm_Object_Item *it,
+                                                             const char *part))
+{
+   ELM_WIDGET_ITEM_CHECK_OR_RETURN(item);
+   item->on_content_unset_func = func;
+}
+
+EAPI void
+_elm_widget_item_text_set_hook_set(Elm_Widget_Item *item,
+                                   void (*func)(Elm_Object_Item *it,
+                                                const char *part,
+                                                const char *label))
+{
+   ELM_WIDGET_ITEM_CHECK_OR_RETURN(item);
+   item->on_text_set_func = func;
+}
+
+EAPI void
+_elm_widget_item_text_get_hook_set(Elm_Widget_Item *item,
+                                   const char *(*func)(const Elm_Object_Item *it,
+                                                       const char *part))
+{
+   ELM_WIDGET_ITEM_CHECK_OR_RETURN(item);
+   item->on_text_get_func = func;
 }
 
 static void

diff --git a/src/lib/elm_widget.h b/src/lib/elm_widget.h
index 8e16778..5bd84c7 100644 (file)
--- a/src/lib/elm_widget.h
+++ b/src/lib/elm_widget.h
@@ -202,17 +202,17 @@ struct _Elm_Widget_Item
    Evas_Object   *view; /**< the base view object */
    const void    *data; /**< item specific data */
    Evas_Smart_Cb  del_cb; /**< used to notify the item is being deleted */
-   void         (*on_content_set_func)(Elm_Widget_Item *item,
+   void         (*on_content_set_func)(Elm_Object_Item *item,
                                        const char *part,
                                        Evas_Object *content);
-   Evas_Object *(*on_content_get_func)(const Elm_Widget_Item *item,
+   Evas_Object *(*on_content_get_func)(const Elm_Object_Item *item,
                                        const char *part);
-   Evas_Object *(*on_content_unset_func)(Elm_Widget_Item *item,
+   Evas_Object *(*on_content_unset_func)(Elm_Object_Item *item,
                                          const char *part);
-   void         (*on_text_set_func)(Elm_Widget_Item *item,
+   void         (*on_text_set_func)(Elm_Object_Item *item,
                                     const char *part,
                                     const char *label);
-   const char  *(*on_text_get_func)(const Elm_Widget_Item *item,
+   const char  *(*on_text_get_func)(const Elm_Object_Item *item,
                                     const char *part);
    /* widget variations should have data from here and on */
    /* @todo: TODO check if this is enough for 1.0 release, maybe add padding! */
@@ -372,6 +372,11 @@ EAPI Evas_Object     *_elm_widget_item_content_part_get(const Elm_Widget_Item *i
 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);
+EAPI void             _elm_widget_item_content_set_hook_set(Elm_Widget_Item *item, void (*func)(Elm_Object_Item *it, const char *part, Evas_Object *content));
+EAPI void             _elm_widget_item_content_get_hook_set(Elm_Widget_Item *item, Evas_Object *(*func)(const Elm_Object_Item *it, const char *part));
+EAPI void             _elm_widget_item_content_unset_hook_set(Elm_Widget_Item *item, Evas_Object *(*func)(Elm_Object_Item *it, const char *part));
+EAPI void             _elm_widget_item_text_set_hook_set(Elm_Widget_Item *item, void (*func)(Elm_Object_Item *it, const char *part, const char *label));
+EAPI void             _elm_widget_item_text_get_hook_set(Elm_Widget_Item *item, const char *(*func)(const Elm_Object_Item *it, const char *part));
 
 
 /* debug function. don't use it unless you are tracking parenting issues */
@@ -528,7 +533,36 @@ EAPI void             elm_widget_tree_dot_dump(const Evas_Object *top, FILE *out
  */
 #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 content set hook.
+ * @see _elm_widget_item_content_set_hook_set()
+ */
+#define elm_widget_item_content_set_hook_set(item, func) \
+  _elm_widget_item_content_set_hook_set((Elm_Widget_Item *)item, func)
+/**
+ * Convenience function to query item's content get hook.
+ * @see _elm_widget_item_content_get_hook_set()
+ */
+#define elm_widget_item_content_get_hook_set(item, func) \
+  _elm_widget_item_content_get_hook_set((Elm_Widget_Item *)item, func)
+/**
+ * Convenience function to query item's content unset hook.
+ * @see _elm_widget_item_content_unset_hook_set()
+ */
+#define elm_widget_item_content_unset_hook_set(item, func) \
+  _elm_widget_item_content_unset_hook_set((Elm_Widget_Item *)item, func)
+/**
+ * Convenience function to query item's text set hook.
+ * @see _elm_widget_item_text_set_hook_set()
+ */
+#define elm_widget_item_text_set_hook_set(item, func) \
+  _elm_widget_item_text_set_hook_set((Elm_Widget_Item *)item, func)
+/**
+ * Convenience function to query item's text get hook.
+ * @see _elm_widget_item_text_get_hook_set()
+ */
+#define elm_widget_item_text_get_hook_set(item, func) \
+  _elm_widget_item_text_get_hook_set((Elm_Widget_Item *)item, func)
 
 /**
  * Cast and ensure the given pointer is an Elm_Widget_Item or return NULL.