yakov pushed a commit to branch master.

http://git.enlightenment.org/tools/erigo.git/commit/?id=a72c3290f55687ccef6179c554f2179e5447595c

commit a72c3290f55687ccef6179c554f2179e5447595c
Author: Yakov Goldberg <yako...@samsung.com>
Date:   Sun Apr 10 18:11:02 2016 +0300

    Refactoring It_Data
    
    Save Eid* instead of Gui_Widget*
---
 src/bin/gui/cbview.c          | 43 ++++++++++++++++++++++---------------------
 src/bin/gui/contentview.c     |  2 +-
 src/bin/gui/descview.c        | 11 ++++++-----
 src/bin/gui/editor.c          |  4 ++--
 src/bin/gui/props_helper.c    |  9 +++++----
 src/bin/gui/props_helper.h    |  4 ++--
 src/bin/gui/propview.c        |  7 ++++---
 src/bin/gui/simple_propview.c |  9 +++++----
 8 files changed, 47 insertions(+), 42 deletions(-)

diff --git a/src/bin/gui/cbview.c b/src/bin/gui/cbview.c
index c702d01..621c142 100644
--- a/src/bin/gui/cbview.c
+++ b/src/bin/gui/cbview.c
@@ -47,7 +47,7 @@ _action_type_changed(void *data, const Eo_Event *event)
 {
    It_Data *it_data = data;
    Gui_Widget_Callback *cb = it_data->cb;
-   Gui_Widget *wdg = (Gui_Widget *) it_data->wdg;
+   Gui_Widget *wdg = wdg_get(it_data->w_eid);
    Gui_Context *ctx = (Gui_Context *) wdg_context_get(wdg);
    void *event_info = event->event_info;
 
@@ -98,7 +98,7 @@ _action_type_changed(void *data, const Eo_Event *event)
       default: break;
      }
 
-   cbview_build(it_data->wdg);
+   cbview_build(wdg_get(it_data->w_eid));
    cbview_item_selected_set(cb_eid_get(cb));
    context_memento_finalize(ctx);
 
@@ -110,7 +110,7 @@ _action_wdg_selected(void *data, Eo *obj EINA_UNUSED, void 
*event_info)
 {
    It_Data *it_data = data;
    Gui_Widget_Callback *cb = it_data->cb;
-   Gui_Widget *wdg = (Gui_Widget *) it_data->wdg;
+   Gui_Widget *wdg = wdg_get(it_data->w_eid);
    Gui_Context *ctx = (Gui_Context *) wdg_context_get(wdg);
 
    Eid *action_id = cb_action_id_get(cb);
@@ -132,7 +132,7 @@ _action_wdg_selected(void *data, Eo *obj EINA_UNUSED, void 
*event_info)
         context_memento_finalize(ctx);
      }
 
-   cbview_build(it_data->wdg);
+   cbview_build(wdg_get(it_data->w_eid));
    cbview_item_selected_set(cb_eid_get(cb));
 }
 
@@ -141,7 +141,7 @@ _action_parent_selected(void *data, const Eo_Event *event)
 {
    It_Data *it_data = data;
    Gui_Widget_Callback *cb = it_data->cb;
-   Gui_Widget *wdg = (Gui_Widget *) it_data->wdg;
+   Gui_Widget *wdg = wdg_get(it_data->w_eid);
    Gui_Context *ctx = (Gui_Context *) wdg_context_get(wdg);
    void *event_info = event->event_info;
 
@@ -160,7 +160,7 @@ _action_parent_selected(void *data, const Eo_Event *event)
         context_memento_finalize(ctx);
      }
 
-   cbview_build(it_data->wdg);
+   cbview_build(wdg_get(it_data->w_eid));
    cbview_item_selected_set(cb_eid_get(cb));
    return EO_CALLBACK_CONTINUE;
 }
@@ -170,7 +170,7 @@ _action_user_cb_selected(void *data, const Eo_Event *event)
 {
    It_Data *it_data = data;
    Gui_Widget_Callback *cb = it_data->cb;
-   Gui_Widget *wdg = (Gui_Widget *) it_data->wdg;
+   Gui_Widget *wdg = wdg_get(it_data->w_eid);
    Gui_Context *ctx = (Gui_Context *) wdg_context_get(wdg);
 
    Eid *action_id = cb_action_id_get(cb);
@@ -188,7 +188,7 @@ _action_user_cb_selected(void *data, const Eo_Event *event)
         context_memento_finalize(ctx);
      }
 
-   cbview_build(it_data->wdg);
+   cbview_build(wdg_get(it_data->w_eid));
    cbview_item_selected_set(cb_eid_get(cb));
    return EO_CALLBACK_CONTINUE;
 }
@@ -239,7 +239,7 @@ _action_prop_selected(void *data, const Eo_Event *event)
         free(_split_ret[0]);
         free(_split_ret);
 
-        cbview_build(it_data->wdg);
+        cbview_build(wdg_get(it_data->w_eid));
         cbview_item_selected_set(cb_eid_get(cb));
         context_memento_finalize(_active_context_get());
      }
@@ -251,7 +251,7 @@ _action_item_selected(void *data, const Eo_Event *event)
 {
    It_Data *it_data = data;
    Gui_Widget_Callback *cb = it_data->cb;
-   Gui_Context *ctx = (Gui_Context *) wdg_context_get(it_data->wdg);
+   Gui_Context *ctx = (Gui_Context *) wdg_context_get(wdg_get(it_data->w_eid));
 
    Eid *action_id = cb_action_id_get(cb);
    Gui_Action *action = action_get(action_id);
@@ -290,7 +290,7 @@ _action_prop_update(void *data, Eo *obj, void *event_info)
    unsigned int par_idx = (unsigned int) (uintptr_t) data;
    It_Data *it_data = eo_key_data_get(obj, "cb_it_data");
    Gui_Widget_Callback *cb = it_data->cb;
-   Gui_Context *ctx = (Gui_Context *) wdg_context_get(it_data->wdg);
+   Gui_Context *ctx = (Gui_Context *) wdg_context_get(wdg_get(it_data->w_eid));
 
    Eid *action_id = cb_action_id_get(cb);
    Gui_Action *action = action_get(action_id);
@@ -504,6 +504,7 @@ _item_content_get(void *data, Evas_Object *obj EINA_UNUSED, 
const char *part EIN
 {
    It_Data *it_data = data;
    const char *default_val = NULL;
+   Gui_Widget *wdg = wdg_get(it_data->w_eid);
 
    // Genlist can call content get without calling delete first
    // so in that case just return what it already has.
@@ -554,18 +555,18 @@ _item_content_get(void *data, Evas_Object *obj 
EINA_UNUSED, const char *part EIN
              elm_obj_hoversel_clear(wdgs->cb_wdgs_hsel);
              if (atype == CREATION_ACTION)
                {
-                  Eo *objects_hs = props_hoversel_objects_add(wdgs->cb_item, 
wdgs->cb_wdgs_hsel, elm_widget_top_get(cb_list), wdg_name, 
gui_context_main_widgets_get(wdg_context_get(it_data->wdg)), NULL);
+                  Eo *objects_hs = props_hoversel_objects_add(wdgs->cb_item, 
wdgs->cb_wdgs_hsel, elm_widget_top_get(cb_list), wdg_name, 
gui_context_main_widgets_get(wdg_context_get(wdg)), NULL);
                   elm_object_tooltip_text_set(objects_hs, "Object to create");
                   Eid *parent_id = action_creation_parent_get(action);
                   const char *parent_name = (parent_id ? 
eid_name_get(parent_id) : NULL);
-                  Eo *parents_hs = props_hoversel_objects_add(wdgs->cb_item, 
NULL, elm_widget_top_get(cb_list), parent_name, 
gui_context_wdg_list_get(wdg_context_get(it_data->wdg)), NULL);
+                  Eo *parents_hs = props_hoversel_objects_add(wdgs->cb_item, 
NULL, elm_widget_top_get(cb_list), parent_name, 
gui_context_wdg_list_get(wdg_context_get(wdg)), NULL);
                   eo_event_callback_add(parents_hs, 
EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, _action_parent_selected, it_data);
                   elm_object_tooltip_text_set(parents_hs, "Parent");
                   it_data->cb_dyn_objs = 
eina_list_append(it_data->cb_dyn_objs, parents_hs);
                }
              else
                {
-                  Eo *user_cb_hs = props_hoversel_objects_add(wdgs->cb_item, 
wdgs->cb_wdgs_hsel, elm_widget_top_get(cb_list), wdg_name, 
gui_context_wdg_list_get(wdg_context_get(it_data->wdg)), NULL);
+                  Eo *user_cb_hs = props_hoversel_objects_add(wdgs->cb_item, 
wdgs->cb_wdgs_hsel, elm_widget_top_get(cb_list), wdg_name, 
gui_context_wdg_list_get(wdg_context_get(wdg)), NULL);
                   elm_object_tooltip_text_set(user_cb_hs, "Object to modify");
                }
              evas_object_smart_callback_add(wdgs->cb_wdgs_hsel, "selected", 
_action_wdg_selected, it_data);
@@ -573,8 +574,8 @@ _item_content_get(void *data, Evas_Object *obj EINA_UNUSED, 
const char *part EIN
         if (atype == MODIF_ACTION)
           {
              Eid *wdg_id = action_widget_id_get(action);
-             Gui_Widget *wdg = wdg_get(wdg_id);
-             Eo *props_hover = props_hoversel_object_ops_add(wdgs->cb_item, 
elm_widget_top_get(cb_list), "   ---   ", wdg);
+             Gui_Widget *wdg_tmp = wdg_get(wdg_id);
+             Eo *props_hover = props_hoversel_object_ops_add(wdgs->cb_item, 
elm_widget_top_get(cb_list), "   ---   ", wdg_tmp);
              elm_object_tooltip_text_set(props_hover, "Property to modify");
              it_data->cb_dyn_objs = eina_list_append(it_data->cb_dyn_objs, 
props_hover);
              eo_event_callback_add(props_hover, 
EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, _action_prop_selected, it_data);
@@ -591,7 +592,7 @@ _item_content_get(void *data, Evas_Object *obj EINA_UNUSED, 
const char *part EIN
                        Gui_Value *val = prop_value_nth_get(prop, 0);
                        if (val)
                          {
-                            const Eina_List *items_list = 
item_container_item_subitems_get(wdg_item_container_root_get(wdg));
+                            const Eina_List *items_list = 
item_container_item_subitems_get(wdg_item_container_root_get(wdg_tmp));
                             Eid *cur_item = EID_ID_GET(val);
                             const char *cur_item_name = 
eid_name_get(cur_item)?:"   ---   ";
                             Eo *items_hover = 
props_hoversel_objects_add(wdgs->cb_item, NULL, elm_widget_top_get(cb_list), 
cur_item_name, items_list, NULL);
@@ -608,7 +609,7 @@ _item_content_get(void *data, Evas_Object *obj EINA_UNUSED, 
const char *part EIN
                          {
                             void *pi = (void *) (uintptr_t) i;
                             Gui_Value *value = ((prop && prop_value_get(prop)) 
? prop_value_nth_get(prop, i) : NULL);
-                            Eo *new_obj = props_value_add(wdgs->cb_item, wdg, 
value, op, i);
+                            Eo *new_obj = props_value_add(wdgs->cb_item, 
wdg_tmp, value, op, i);
                             it_data->cb_dyn_objs = 
eina_list_append(it_data->cb_dyn_objs, new_obj);
                             if (new_obj)
                               {
@@ -630,7 +631,7 @@ _item_content_get(void *data, Evas_Object *obj EINA_UNUSED, 
const char *part EIN
           {
              Eid *cb_id = action_user_cb_id_get(action);
              const char *cb_name = (cb_id ? eid_name_get(cb_id) : NULL);
-             Eo *cbs_hs = props_hoversel_resources_add(wdgs->cb_item, NULL, 
elm_widget_top_get(cb_list), cb_name, wdg_context_get(it_data->wdg), 
RESOURCE_EO_CALLBACK);
+             Eo *cbs_hs = props_hoversel_resources_add(wdgs->cb_item, NULL, 
elm_widget_top_get(cb_list), cb_name, wdg_context_get(wdg), 
RESOURCE_EO_CALLBACK);
              eo_event_callback_add(cbs_hs, 
EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, _action_user_cb_selected, it_data);
              elm_object_tooltip_text_set(cbs_hs, "User callback");
              it_data->cb_dyn_objs = eina_list_append(it_data->cb_dyn_objs, 
cbs_hs);
@@ -713,7 +714,7 @@ _selected_callback_move(int dir)
              Callback_Container *cc_new;
 
              Gui_Widget_Callback *cb = it_data->cb;
-             const Gui_Widget *wdg = it_data->wdg;
+             Gui_Widget *wdg = wdg_get(it_data->w_eid);
              cc_old = wdg_cb_container_get(wdg);
              cc_new = cb_container_copy(cc_old);
              if (cb_container_cb_move(cc_new, cb, dir))
@@ -764,7 +765,7 @@ _callbacksview_del_btn_clicked(void *data EINA_UNUSED, Eo 
*obj EINA_UNUSED, cons
         Callback_Container *cc_new;
 
         Gui_Widget_Callback *cb = it_data->cb;
-        const Gui_Widget *wdg = it_data->wdg;
+        Gui_Widget *wdg = wdg_get(it_data->w_eid);
         cc_old = wdg_cb_container_get(wdg);
         cc_new = cb_container_copy(cc_old);
         cb_container_cb_remove(cc_new, cb);
diff --git a/src/bin/gui/contentview.c b/src/bin/gui/contentview.c
index 98fb67e..58e8eb5 100644
--- a/src/bin/gui/contentview.c
+++ b/src/bin/gui/contentview.c
@@ -33,7 +33,7 @@ _pfd_free_cb(void *pfd, const Eo_Event *event EINA_UNUSED)
 static Evas_Object *
 _content_item_content_get(It_Data *it_data)
 {
-   const Gui_Widget *wdg = it_data->wdg;
+   const Gui_Widget *wdg = wdg_get(it_data->w_eid);
 
    unsigned int count, i;
    count = db_op_desc_param_number_get(it_data->op_desc);
diff --git a/src/bin/gui/descview.c b/src/bin/gui/descview.c
index 4c70e2c..ba33d28 100644
--- a/src/bin/gui/descview.c
+++ b/src/bin/gui/descview.c
@@ -70,6 +70,7 @@ static Evas_Object *
 _description_item_content_get(It_Data *it_data)
 {
    Evas_Object *box = eo_add(ELM_BOX_CLASS, desc_list);
+   const Gui_Widget *wdg = wdg_get(it_data->w_eid);
    efl_gfx_visible_set(box, EINA_TRUE);
    elm_obj_box_horizontal_set(box, EINA_TRUE);
    elm_obj_box_padding_set(box, 5, 0);
@@ -85,20 +86,20 @@ _description_item_content_get(It_Data *it_data)
 
    if (!strcmp(it_data->desc, DB_DEF_PUBLIC))
      {
-        Eo *ck = props_toggle_add(box, wdg_public_get(it_data->wdg));
-        eo_event_callback_add(ck, ELM_CHECK_EVENT_CHANGED, 
_wdg_public_change_cb, it_data->wdg);
+        Eo *ck = props_toggle_add(box, wdg_public_get(wdg));
+        eo_event_callback_add(ck, ELM_CHECK_EVENT_CHANGED, 
_wdg_public_change_cb, wdg);
         elm_object_tooltip_text_set(ck, "Check to make widget accissible from 
code");
      }
    else if (!strcmp(it_data->desc, DB_DEF_NAME))
      {
-        Eo *entry = props_entry_add(box, wdg_name_get(it_data->wdg), 
GUI_TYPE_STRING);
-        eo_event_callback_add(entry, ELM_ENTRY_EVENT_ACTIVATED, 
_wdg_name_change_cb, it_data->wdg);
+        Eo *entry = props_entry_add(box, wdg_name_get(wdg), GUI_TYPE_STRING);
+        eo_event_callback_add(entry, ELM_ENTRY_EVENT_ACTIVATED, 
_wdg_name_change_cb, wdg);
         prop_memo_bubble_add(entry, "Press Enter to apply changes");
         elm_object_tooltip_text_set(entry, "Widget name");
      }
    else if (!strcmp(it_data->desc, DB_DEF_CLASS))
      {
-        Eo *entry = props_entry_add(box, wdg_class_name_get(it_data->wdg), 
GUI_TYPE_STRING);
+        Eo *entry = props_entry_add(box, wdg_class_name_get(wdg), 
GUI_TYPE_STRING);
         elm_object_disabled_set(entry, EINA_TRUE);
         elm_object_tooltip_text_set(entry, "Widget class");
      }
diff --git a/src/bin/gui/editor.c b/src/bin/gui/editor.c
index f7e1107..93b0d83 100644
--- a/src/bin/gui/editor.c
+++ b/src/bin/gui/editor.c
@@ -3459,7 +3459,7 @@ _prop_update_from_propview_int(void *data EINA_UNUSED, Eo 
*obj, const Eo_Event_D
    if (!op)
      op = original_op_desc_get(pfd->it_data->orig_op_desc);
 
-   wdg = pfd->it_data->wdg;
+   wdg = wdg_get(pfd->it_data->w_eid);
    prop = (Gui_Widget_Property *)pfd->it_data->prop;
    idx = pfd->par_idx;
    /* propdata box, change its color then value changed from default. */
@@ -4171,7 +4171,7 @@ _content_change_from_propview(void *data EINA_UNUSED, 
const Eo_Event *event)
    /* Get data for changed field. */
    pfd = eo_key_data_get(event->obj, _STR_EDITOR);
 
-   const Gui_Widget *wdg = pfd->it_data->wdg;
+   const Gui_Widget *wdg = wdg_get(pfd->it_data->w_eid);
    int par_idx = pfd->par_idx;
    Gui_Value *val = NULL;
    Gui_Type type = GUI_TYPE_NONE;
diff --git a/src/bin/gui/props_helper.c b/src/bin/gui/props_helper.c
index 297e51e..dc2eb0a 100644
--- a/src/bin/gui/props_helper.c
+++ b/src/bin/gui/props_helper.c
@@ -44,6 +44,7 @@ void
 _prop_field_update(const Gui_Widget_Property *prop, Eo *item_box, It_Data 
*it_data)
 {
    Eina_List *box_list, *box_list_itr, *par_list, *l;
+   Gui_Widget *wdg = wdg_get(it_data->w_eid);
    Gui_Value *val;
    int i = 0;
 
@@ -106,8 +107,8 @@ _prop_field_update(const Gui_Widget_Property *prop, Eo 
*item_box, It_Data *it_da
            case GUI_TYPE_FILE:
                 {
                    elm_obj_hoversel_clear(o);
-                   props_hoversel_resources_add(NULL, o, NULL, NULL, 
wdg_context_get(it_data->wdg), RESOURCE_IMAGE);
-                   props_hoversel_resources_add(NULL, o, NULL, NULL, 
wdg_context_get(it_data->wdg), RESOURCE_EDJE);
+                   props_hoversel_resources_add(NULL, o, NULL, NULL, 
wdg_context_get(wdg), RESOURCE_IMAGE);
+                   props_hoversel_resources_add(NULL, o, NULL, NULL, 
wdg_context_get(wdg), RESOURCE_EDJE);
 
                    Eid *eid = EID_ID_GET(prop_value_nth_get(prop, i));
                    const char *default_str = PROP_HOVERSEL_NONE_VALUE;
@@ -127,7 +128,7 @@ _prop_field_update(const Gui_Widget_Property *prop, Eo 
*item_box, It_Data *it_da
            case GUI_TYPE_THEME:
                 {
                    elm_obj_hoversel_clear(o);
-                   props_hoversel_resources_add(NULL, o, NULL, NULL, 
wdg_context_get(it_data->wdg), RESOURCE_THEME);
+                   props_hoversel_resources_add(NULL, o, NULL, NULL, 
wdg_context_get(wdg), RESOURCE_THEME);
 
                    Eid *eid = EID_ID_GET(prop_value_nth_get(prop, i));
                    const char *default_str = PROP_HOVERSEL_NONE_VALUE;
@@ -147,7 +148,7 @@ _prop_field_update(const Gui_Widget_Property *prop, Eo 
*item_box, It_Data *it_da
            case GUI_TYPE_OBJECT:
                 {
                    elm_obj_hoversel_clear(o);
-                   props_hoversel_objects_add(NULL, o, NULL, NULL, 
gui_context_wdg_list_get(wdg_context_get(it_data->wdg)), it_data->wdg);
+                   props_hoversel_objects_add(NULL, o, NULL, NULL, 
gui_context_wdg_list_get(wdg_context_get(wdg)), wdg);
                    Eid *eid = EID_ID_GET(prop_value_nth_get(prop, i));
                    const char *default_str = PROP_HOVERSEL_NONE_VALUE;
                    if (IS_ID_VALID(eid))
diff --git a/src/bin/gui/props_helper.h b/src/bin/gui/props_helper.h
index ba22775..b23d57b 100644
--- a/src/bin/gui/props_helper.h
+++ b/src/bin/gui/props_helper.h
@@ -20,7 +20,7 @@
     }\
     else \
     { \
-      _it->wdg = (Gui_Widget *)(wi); \
+      _it->w_eid = wdg_eid_get((Gui_Widget *)(wi)); \
     }\
     _it; \
     })
@@ -44,7 +44,7 @@ typedef struct
    It_Data_Type type;
    union
      {
-        const Gui_Widget *wdg;
+        Eid *w_eid;
         const Item_Container_Item *item;
      };
    union
diff --git a/src/bin/gui/propview.c b/src/bin/gui/propview.c
index 0a66301..c014112 100644
--- a/src/bin/gui/propview.c
+++ b/src/bin/gui/propview.c
@@ -87,7 +87,7 @@ _property_item_content_get(It_Data *it_data)
         /* Get value, for which we want to build field.
          * If it is NULL, field will be build, for nth value in Op_Desc*/
         Gui_Value *value = ((prop && prop_value_get(prop)) ? 
prop_value_nth_get(prop, i) : NULL);
-        Eo *obj = props_value_add(box, it_data->wdg, value, op, i);
+        Eo *obj = props_value_add(box, wdg_get(it_data->w_eid), value, op, i);
         if (obj)
           {
              Par_Field_Data *pfd = calloc (1, sizeof(Par_Field_Data));
@@ -141,6 +141,7 @@ static Evas_Object *
 _prop_item_content_get(void *data, Evas_Object *obj EINA_UNUSED, const char 
*part EINA_UNUSED)
 {
    It_Data *it_data = data;
+   Gui_Widget *wdg = wdg_get(it_data->w_eid);
 
    if (it_data->box) return it_data->box;
 
@@ -155,7 +156,7 @@ _prop_item_content_get(void *data, Evas_Object *obj 
EINA_UNUSED, const char *par
         /* Check if get function is implemented for this property. */
         Eolian_Function_Type func_type = db_op_desc_type_get(it_data->op_desc);
         const Eolian_Class *f_klass = 
eolian_class_get_by_name(db_op_desc_class_name_get(it_data->op_desc));
-        const Eolian_Class *w_klass = 
eolian_class_get_by_name(wdg_class_name_get(it_data->wdg));
+        const Eolian_Class *w_klass = 
eolian_class_get_by_name(wdg_class_name_get(wdg));
 
         const char *func_name = db_op_desc_op_name_get(it_data->op_desc);
 
@@ -163,7 +164,7 @@ _prop_item_content_get(void *data, Evas_Object *obj 
EINA_UNUSED, const char *par
         Eina_Bool ret = eolian_function_is_implemented(func_id, func_type, 
w_klass);
         if (ret)
           {
-             manager_widget_property_get(session, it_data->wdg, it_data->prop);
+             manager_widget_property_get(session, wdg, it_data->prop);
           }
         else
           {
diff --git a/src/bin/gui/simple_propview.c b/src/bin/gui/simple_propview.c
index 89e40ed..84be60b 100644
--- a/src/bin/gui/simple_propview.c
+++ b/src/bin/gui/simple_propview.c
@@ -139,7 +139,7 @@ _color_change_popup_cb(Popup_Button_Type button_type, void 
*data)
         efl_gfx_color_set(pcd->button, pcd->r, pcd->g, pcd->b, pcd->a);
         It_Data *it_data = pcd->it_data;
 
-        const Gui_Widget *wdg = it_data->wdg;
+        const Gui_Widget *wdg = wdg_get(it_data->w_eid);
         Gui_Widget_Property *prop = NULL, *old_property = NULL;
         Gui_Value *val = NULL;
         Gui_Context *ctx = _active_context_get();
@@ -333,7 +333,7 @@ _property_item_content_get(Eo *box, It_Data *it_data, const 
char *name)
                   continue;
                }
           }
-        Eo *obj = props_value_add(box, it_data->wdg, value, op, i);
+        Eo *obj = props_value_add(box, wdg_get(it_data->w_eid), value, op, i);
         if (obj)
           {
              Par_Field_Data *pfd = calloc (1, sizeof(Par_Field_Data));
@@ -389,6 +389,7 @@ _simple_prop_item_content_get(It_Data *data, const char 
*simple_op_name)
 
    if (!it_data->prop)
      {
+        Gui_Widget *wdg = wdg_get(it_data->w_eid);
         it_data->prop = prop_create_for_op(op_desc);
         const Gui_Context *ctx = _active_context_get();
         Gui_Session *session = (Gui_Session *) 
gui_context_editor_session_get(ctx);
@@ -396,7 +397,7 @@ _simple_prop_item_content_get(It_Data *data, const char 
*simple_op_name)
         /* Check if get function is implemented for this property. */
         Eolian_Function_Type func_type = db_op_desc_type_get(op_desc);
         const Eolian_Class *f_klass = 
eolian_class_get_by_name(db_op_desc_class_name_get(op_desc));
-        const Eolian_Class *w_klass = 
eolian_class_get_by_name(wdg_class_name_get(it_data->wdg));
+        const Eolian_Class *w_klass = 
eolian_class_get_by_name(wdg_class_name_get(wdg));
 
         const char *func_name = db_op_desc_op_name_get(op_desc);
 
@@ -404,7 +405,7 @@ _simple_prop_item_content_get(It_Data *data, const char 
*simple_op_name)
         Eina_Bool ret = eolian_function_is_implemented(func_id, func_type, 
w_klass);
         if (ret)
           {
-             manager_widget_property_get(session, it_data->wdg, it_data->prop);
+             manager_widget_property_get(session, wdg, it_data->prop);
           }
         else
           {

-- 


Reply via email to