forked from enlightenment/efl
elementary: update to new eo_parent_get/set API.
This commit is contained in:
parent
9785020b1f
commit
29af5e1e43
|
@ -1130,8 +1130,7 @@ _elm_ctxpopup_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
|||
Elm_Ctxpopup_Smart_Data *priv = _pd;
|
||||
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
|
||||
if (!elm_layout_theme_set
|
||||
(obj, "ctxpopup", "base", elm_widget_style_get(obj)))
|
||||
|
|
|
@ -919,8 +919,7 @@ _elm_fileselector_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
|||
EINA_REFCOUNT_INIT(priv);
|
||||
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
elm_widget_can_focus_set(obj, EINA_FALSE);
|
||||
|
||||
priv->expand = !!_elm_config->fileselector_expand_enable;
|
||||
|
|
|
@ -174,8 +174,7 @@ _elm_fileselector_button_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED
|
|||
Elm_Fileselector_Button_Smart_Data *priv = _pd;
|
||||
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
|
||||
priv->window_title = eina_stringshare_add(DEFAULT_WINDOW_TITLE);
|
||||
if (getenv("HOME")) priv->fsd.path = eina_stringshare_add(getenv("HOME"));
|
||||
|
|
|
@ -345,8 +345,7 @@ _elm_fileselector_entry_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
|||
Elm_Fileselector_Entry_Smart_Data *priv = _pd;
|
||||
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
|
||||
if (!elm_layout_theme_set
|
||||
(obj, "fileselector_entry", "base", elm_widget_style_get(obj)))
|
||||
|
|
|
@ -225,8 +225,7 @@ _elm_hoversel_smart_add(Eo *obj, void *_pd __UNUSED__,
|
|||
va_list *list EINA_UNUSED)
|
||||
{
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
|
||||
elm_widget_mirrored_automatic_set(obj, EINA_FALSE);
|
||||
|
||||
|
|
|
@ -1452,8 +1452,7 @@ _elm_multibuttonentry_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
|||
Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
|
||||
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
|
||||
if (!elm_layout_theme_set
|
||||
(obj, "multibuttonentry", "base", elm_widget_style_get(obj)))
|
||||
|
|
|
@ -1321,6 +1321,7 @@ _elm_naviframe_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
|||
Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
|
||||
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
|
||||
priv->dummy_edje = wd->resize_obj;
|
||||
evas_object_smart_member_add(priv->dummy_edje, obj);
|
||||
|
@ -1331,8 +1332,6 @@ _elm_naviframe_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
|||
evas_object_event_callback_add(obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
|
||||
_on_obj_size_hints_changed, obj);
|
||||
elm_widget_can_focus_set(obj, EINA_TRUE);
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
}
|
||||
|
||||
static Eina_Bool
|
||||
|
|
|
@ -629,12 +629,11 @@ end:
|
|||
static void
|
||||
_elm_player_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
||||
{
|
||||
char buf[256];
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
|
||||
Elm_Player_Smart_Data *priv = _pd;
|
||||
char buf[256];
|
||||
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
|
||||
if (!elm_layout_theme_set(obj, "player", "base", elm_widget_style_get(obj)))
|
||||
CRITICAL("Failed to set layout!");
|
||||
|
|
|
@ -1490,13 +1490,14 @@ _elm_popup_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
|||
{
|
||||
Elm_Popup_Smart_Data *priv = _pd;
|
||||
Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
|
||||
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
|
||||
evas_object_size_hint_weight_set
|
||||
(wd->resize_obj, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
|
||||
evas_object_size_hint_align_set
|
||||
(wd->resize_obj, EVAS_HINT_FILL, EVAS_HINT_FILL);
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
|
||||
if (!elm_layout_theme_set(obj, "popup", "base", elm_widget_style_get(obj)))
|
||||
CRITICAL("Failed to set layout!");
|
||||
|
|
|
@ -37,8 +37,7 @@ static void
|
|||
_elm_access_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
|
||||
{
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
}
|
||||
|
||||
static Eina_Bool
|
||||
|
|
|
@ -398,8 +398,7 @@ _elm_actionslider_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
|||
Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
|
||||
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
|
||||
priv->enabled_position = ELM_ACTIONSLIDER_ALL;
|
||||
|
||||
|
|
|
@ -164,7 +164,7 @@ _app_client_view_constructor(Eo *eo, void *_pd, va_list *list)
|
|||
EINA_SAFETY_ON_NULL_GOTO(path, error);
|
||||
eo_do_super(eo, MY_CLASS, eo_constructor());
|
||||
|
||||
parent = eo_parent_get(eo);
|
||||
eo_do(eo, eo_parent_get(&parent));
|
||||
EINA_SAFETY_ON_TRUE_GOTO((!parent) ||
|
||||
(!eo_isa(parent, ELM_APP_CLIENT_CLASS)), error);
|
||||
|
||||
|
|
|
@ -362,7 +362,7 @@ _app_server_view_constructor(Eo *obj, void *_pd, va_list *list)
|
|||
|
||||
eo_do_super(obj, MY_CLASS, eo_constructor());
|
||||
|
||||
server = eo_parent_get(obj);
|
||||
eo_do(obj, eo_parent_get(&server));
|
||||
EINA_SAFETY_ON_TRUE_GOTO(!server || !eo_isa(server, ELM_APP_SERVER_CLASS), error);
|
||||
|
||||
if (!id)
|
||||
|
|
|
@ -106,8 +106,7 @@ _elm_bg_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
|||
Elm_Bg_Smart_Data *priv = _pd;
|
||||
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
elm_widget_can_focus_set(obj, EINA_FALSE);
|
||||
|
||||
priv->option = ELM_BG_OPTION_SCALE;
|
||||
|
|
|
@ -407,8 +407,7 @@ _elm_box_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
|
|||
_on_size_hints_changed, obj);
|
||||
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
|
||||
evas_object_smart_callback_add(wd->resize_obj, SIG_CHILD_ADDED,
|
||||
_child_added_cb_proxy, obj);
|
||||
|
|
|
@ -202,8 +202,7 @@ _elm_bubble_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
|||
Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
|
||||
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
|
||||
priv->pos = ELM_BUBBLE_POS_TOP_LEFT; //default
|
||||
|
||||
|
|
|
@ -289,8 +289,7 @@ _elm_button_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
|
|||
Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
|
||||
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
|
||||
edje_object_signal_callback_add
|
||||
(wd->resize_obj, "elm,action,click", "",
|
||||
|
|
|
@ -949,8 +949,7 @@ _elm_calendar_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
|||
Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
|
||||
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
|
||||
priv->first_interval = 0.85;
|
||||
priv->year_min = 2;
|
||||
|
|
|
@ -292,8 +292,7 @@ _elm_check_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
|
|||
Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
|
||||
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
|
||||
edje_object_signal_callback_add
|
||||
(wd->resize_obj, "elm,action,check,on", "",
|
||||
|
|
|
@ -667,8 +667,7 @@ _elm_clock_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
|||
Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
|
||||
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
|
||||
priv->cur.ampm = -1;
|
||||
priv->cur.seconds = EINA_TRUE;
|
||||
|
|
|
@ -1472,8 +1472,7 @@ _elm_colorselector_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
|||
Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
|
||||
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
|
||||
if (!elm_layout_theme_set
|
||||
(obj, "colorselector", "palette", elm_object_style_get(obj)))
|
||||
|
|
|
@ -899,8 +899,7 @@ static void
|
|||
_elm_conformant_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
|
||||
{
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
elm_widget_can_focus_set(obj, EINA_FALSE);
|
||||
|
||||
if (!elm_layout_theme_set
|
||||
|
|
|
@ -792,14 +792,12 @@ _access_info_cb(void *data, Evas_Object *obj __UNUSED__)
|
|||
static void
|
||||
_elm_datetime_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
||||
{
|
||||
int idx;
|
||||
Datetime_Field *field;
|
||||
|
||||
Elm_Datetime_Smart_Data *priv = _pd;
|
||||
Datetime_Field *field;
|
||||
int idx;
|
||||
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
|
||||
if (!elm_layout_theme_set(obj, "datetime", "base",
|
||||
elm_widget_style_get(obj)))
|
||||
|
|
|
@ -431,8 +431,7 @@ _elm_dayselector_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
|||
Elm_Dayselector_Smart_Data *priv = _pd;
|
||||
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
|
||||
if (!elm_layout_theme_set(obj, "dayselector", "base", "dayselector"))
|
||||
CRITICAL("Failed to set layout!");
|
||||
|
|
|
@ -1271,7 +1271,7 @@ _elm_diskselector_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
|||
Evas *evas;
|
||||
Evas_Object *blank, *edje;
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
|
||||
evas = evas_object_evas_get(obj);
|
||||
evas_event_freeze(evas);
|
||||
|
|
|
@ -2958,8 +2958,7 @@ _elm_entry_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
|||
Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
|
||||
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
|
||||
priv->entry_edje = wd->resize_obj;
|
||||
|
||||
|
|
|
@ -1848,8 +1848,7 @@ _elm_flip_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
|||
Elm_Flip_Smart_Data *priv = _pd;
|
||||
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
|
||||
priv->clip = evas_object_rectangle_add(evas_object_evas_get(obj));
|
||||
evas_object_static_clip_set(priv->clip, EINA_TRUE);
|
||||
|
|
|
@ -558,8 +558,7 @@ _elm_flipselector_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
|||
Elm_Flipselector_Smart_Data *priv = _pd;
|
||||
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
|
||||
if (!elm_layout_theme_set
|
||||
(obj, "flipselector", "base", elm_widget_style_get(obj)))
|
||||
|
|
|
@ -174,8 +174,7 @@ _elm_frame_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
|
|||
Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
|
||||
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
|
||||
edje_object_signal_callback_add
|
||||
(wd->resize_obj, "elm,anim,done", "elm",
|
||||
|
|
|
@ -2382,8 +2382,7 @@ _elm_gengrid_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
|||
Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
|
||||
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
|
||||
priv->hit_rect = evas_object_rectangle_add(evas_object_evas_get(obj));
|
||||
evas_object_smart_member_add(priv->hit_rect, obj);
|
||||
|
|
|
@ -4817,16 +4817,14 @@ _decorate_item_unset(Elm_Genlist_Smart_Data *sd)
|
|||
static void
|
||||
_elm_genlist_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
||||
{
|
||||
Evas_Coord minw, minh;
|
||||
Elm_Genlist_Pan_Smart_Data *pan_data;
|
||||
int i;
|
||||
|
||||
Elm_Genlist_Smart_Data *priv = _pd;
|
||||
Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
|
||||
Elm_Genlist_Pan_Smart_Data *pan_data;
|
||||
Evas_Coord minw, minh;
|
||||
int i;
|
||||
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
|
||||
priv->hit_rect = evas_object_rectangle_add(evas_object_evas_get(obj));
|
||||
evas_object_smart_member_add(priv->hit_rect, obj);
|
||||
|
|
|
@ -3734,12 +3734,11 @@ _elm_gesture_layer_smart_disable(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
|
|||
static void
|
||||
_elm_gesture_layer_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
||||
{
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
|
||||
Elm_Gesture_Layer_Smart_Data *priv = _pd;
|
||||
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
|
||||
priv->line_min_length =
|
||||
_elm_config->glayer_line_min_length * elm_config_finger_size_get();
|
||||
priv->zoom_distance_tolerance = _elm_config->glayer_zoom_distance_tolerance
|
||||
|
|
|
@ -197,16 +197,18 @@ _set_render_policy_callback(Evas_Object *obj)
|
|||
static void
|
||||
_elm_glview_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
||||
{
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
Elm_Glview_Smart_Data *priv = _pd;
|
||||
Evas_Object *img;
|
||||
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
|
||||
// Create image to render Evas_GL Surface
|
||||
Evas_Object *img = evas_object_image_filled_add(evas_object_evas_get(obj));
|
||||
img = evas_object_image_filled_add(evas_object_evas_get(obj));
|
||||
elm_widget_resize_object_set(obj, img);
|
||||
evas_object_image_size_set(img, 1, 1);
|
||||
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
|
||||
Elm_Glview_Smart_Data *priv = _pd;
|
||||
// Evas_GL
|
||||
priv->evasgl = evas_gl_new(evas_object_evas_get(obj));
|
||||
if (!priv->evasgl)
|
||||
|
|
|
@ -131,11 +131,12 @@ _elm_grid_smart_theme(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
|
|||
static void
|
||||
_elm_grid_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
|
||||
{
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
|
||||
Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
|
||||
Evas_Object *grid;
|
||||
|
||||
Evas_Object *grid = evas_object_grid_add(evas_object_evas_get(obj));
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
|
||||
grid = evas_object_grid_add(evas_object_evas_get(obj));
|
||||
elm_widget_resize_object_set(obj, grid);
|
||||
evas_object_grid_size_set(wd->resize_obj, 100, 100);
|
||||
|
||||
|
|
|
@ -540,13 +540,11 @@ _hov_dismiss_cb(void *data,
|
|||
static void
|
||||
_elm_hover_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
||||
{
|
||||
Elm_Hover_Smart_Data *priv = _pd;
|
||||
unsigned int i;
|
||||
|
||||
Elm_Hover_Smart_Data *priv = _pd;
|
||||
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
|
||||
for (i = 0; i < sizeof(priv->subs) / sizeof(priv->subs[0]); i++)
|
||||
priv->subs[i].swallow = _content_aliases[i].alias;
|
||||
|
|
|
@ -607,12 +607,11 @@ _elm_icon_thumb_resize_cb(void *data,
|
|||
static void
|
||||
_elm_icon_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
||||
{
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
|
||||
Elm_Icon_Smart_Data *priv = _pd;
|
||||
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
|
||||
priv->lookup_order = ELM_ICON_LOOKUP_THEME_FDO;
|
||||
|
||||
#ifdef HAVE_ELEMENTARY_ETHUMB
|
||||
|
|
|
@ -455,12 +455,11 @@ _elm_image_drag_n_drop_cb(void *elm_obj,
|
|||
static void
|
||||
_elm_image_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
||||
{
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
|
||||
Elm_Image_Smart_Data *priv = _pd;
|
||||
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
|
||||
priv->hit_rect = evas_object_rectangle_add(evas_object_evas_get(obj));
|
||||
evas_object_smart_member_add(priv->hit_rect, obj);
|
||||
elm_widget_sub_object_add(obj, priv->hit_rect);
|
||||
|
|
|
@ -907,8 +907,7 @@ _elm_index_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
|||
Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
|
||||
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
|
||||
if (!elm_layout_theme_set
|
||||
(obj, "index", "base/vertical", elm_widget_style_get(obj)))
|
||||
|
|
|
@ -75,8 +75,7 @@ static void
|
|||
_elm_inwin_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
|
||||
{
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
|
||||
elm_widget_can_focus_set(obj, EINA_FALSE);
|
||||
elm_widget_highlight_ignore_set(obj, EINA_TRUE);
|
||||
|
@ -115,7 +114,9 @@ elm_win_inwin_add(Evas_Object *parent)
|
|||
static void
|
||||
_constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
|
||||
{
|
||||
Evas_Object *parent = eo_parent_get(obj);
|
||||
Evas_Object *parent;
|
||||
|
||||
eo_do(obj, eo_parent_get(&parent));
|
||||
|
||||
if (!eo_isa(parent, ELM_OBJ_WIN_CLASS))
|
||||
{
|
||||
|
|
|
@ -383,7 +383,7 @@ _elm_label_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
|||
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
|
||||
priv->linewrap = ELM_WRAP_NONE;
|
||||
priv->wrap_w = -1;
|
||||
|
|
|
@ -697,7 +697,7 @@ _elm_layout_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
|
|||
{
|
||||
Evas_Object *edje;
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
|
||||
/* has to be there *before* parent's smart_add() */
|
||||
edje = edje_object_add(evas_object_evas_get(obj));
|
||||
|
|
|
@ -1700,8 +1700,7 @@ _elm_list_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
|||
Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
|
||||
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
|
||||
elm_widget_can_focus_set(obj, EINA_TRUE);
|
||||
|
||||
|
|
|
@ -3976,7 +3976,7 @@ _elm_map_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
|||
|
||||
Elm_Map_Smart_Data *priv = _pd;
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
|
||||
edje = edje_object_add(evas_object_evas_get(obj));
|
||||
elm_widget_resize_object_set(obj, edje);
|
||||
|
|
|
@ -337,8 +337,7 @@ _elm_mapbuf_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
|||
elm_widget_resize_object_set(obj, rect);
|
||||
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
|
||||
evas_object_static_clip_set(rect, EINA_TRUE);
|
||||
evas_object_pass_events_set(rect, EINA_TRUE);
|
||||
|
|
|
@ -590,8 +590,7 @@ _elm_menu_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
|||
Elm_Menu_Smart_Data *priv = _pd;
|
||||
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
|
||||
elm_widget_can_focus_set(obj, EINA_FALSE);
|
||||
|
||||
|
@ -702,12 +701,15 @@ static void
|
|||
_constructor(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
||||
{
|
||||
Elm_Menu_Smart_Data *sd = _pd;
|
||||
Eo *parent;
|
||||
|
||||
eo_do_super(obj, MY_CLASS, eo_constructor());
|
||||
eo_do(obj,
|
||||
evas_obj_type_set(MY_CLASS_NAME),
|
||||
evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL));
|
||||
evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL),
|
||||
eo_parent_get(&parent));
|
||||
|
||||
elm_menu_parent_set(obj, eo_parent_get(obj));
|
||||
elm_menu_parent_set(obj, parent);
|
||||
elm_hover_target_set(sd->hv, sd->location);
|
||||
elm_layout_content_set
|
||||
(sd->hv, elm_hover_best_content_location_get
|
||||
|
|
|
@ -475,8 +475,7 @@ _elm_notify_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
|||
Elm_Notify_Smart_Data *priv = _pd;
|
||||
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
|
||||
priv->allow_events = EINA_TRUE;
|
||||
|
||||
|
|
|
@ -353,11 +353,9 @@ _elm_panel_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
|||
{
|
||||
Elm_Panel_Smart_Data *priv = _pd;
|
||||
Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
|
||||
|
||||
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
elm_widget_can_focus_set(obj, EINA_TRUE);
|
||||
|
||||
/* just to bootstrap and have theme hook to work */
|
||||
|
|
|
@ -202,8 +202,7 @@ _elm_panes_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
|
|||
ELM_PANES_DATA_GET(obj, sd);
|
||||
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
|
||||
if (!elm_layout_theme_set
|
||||
(obj, "panes", "vertical", elm_widget_style_get(obj)))
|
||||
|
|
|
@ -256,8 +256,7 @@ _elm_photo_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
|||
Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
|
||||
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
|
||||
elm_widget_can_focus_set(obj, EINA_FALSE);
|
||||
|
||||
|
|
|
@ -1320,14 +1320,13 @@ _g_layer_zoom_end_cb(void *data,
|
|||
static void
|
||||
_elm_photocam_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
||||
{
|
||||
Evas_Coord minw, minh;
|
||||
Elm_Photocam_Pan_Smart_Data *pan_data;
|
||||
Eina_Bool bounce = _elm_config->thumbscroll_bounce_enable;
|
||||
Evas_Object *edje;
|
||||
|
||||
Elm_Photocam_Smart_Data *priv = _pd;
|
||||
Eina_Bool bounce = _elm_config->thumbscroll_bounce_enable;
|
||||
Elm_Photocam_Pan_Smart_Data *pan_data;
|
||||
Evas_Object *edje;
|
||||
Evas_Coord minw, minh;
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
|
||||
edje = edje_object_add(evas_object_evas_get(obj));
|
||||
elm_widget_resize_object_set(obj, edje);
|
||||
|
|
|
@ -91,12 +91,10 @@ _elm_plug_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
|
|||
{
|
||||
Evas_Object *p_obj;
|
||||
Ecore_Evas *ee;
|
||||
|
||||
Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
|
||||
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
|
||||
ee = ecore_evas_ecore_evas_get(evas_object_evas_get(obj));
|
||||
if (!ee) return;
|
||||
|
|
|
@ -48,8 +48,7 @@ static void
|
|||
_elm_prefs_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
|
||||
{
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
}
|
||||
|
||||
static void _item_free(Elm_Prefs_Item_Node *it);
|
||||
|
|
|
@ -267,8 +267,7 @@ _elm_progressbar_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
|||
Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
|
||||
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
|
||||
priv->horizontal = EINA_TRUE;
|
||||
priv->units = eina_stringshare_add("%.0f %%");
|
||||
|
|
|
@ -275,8 +275,7 @@ _elm_radio_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
|||
Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
|
||||
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
|
||||
if (!elm_layout_theme_set(obj, "radio", "base", elm_widget_style_get(obj)))
|
||||
CRITICAL("Failed to set layout!");
|
||||
|
|
|
@ -143,8 +143,7 @@ _elm_route_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
|||
Elm_Route_Smart_Data *priv = _pd;
|
||||
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
elm_widget_can_focus_set(obj, EINA_FALSE);
|
||||
|
||||
evas_object_event_callback_add
|
||||
|
|
|
@ -744,14 +744,12 @@ _elm_scroller_content_viewport_resize_cb(Evas_Object *obj,
|
|||
static void
|
||||
_elm_scroller_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
||||
{
|
||||
Evas_Coord minw, minh;
|
||||
|
||||
Elm_Scroller_Smart_Data *priv = _pd;
|
||||
Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
|
||||
Evas_Coord minw, minh;
|
||||
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
elm_widget_can_focus_set(obj, EINA_TRUE);
|
||||
|
||||
if (!elm_layout_theme_set
|
||||
|
|
|
@ -609,8 +609,7 @@ static void
|
|||
_elm_segment_control_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
|
||||
{
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
|
||||
if (!elm_layout_theme_set
|
||||
(obj, "segment_control", "base", elm_widget_style_get(obj)))
|
||||
|
|
|
@ -52,8 +52,7 @@ _elm_separator_smart_add(Eo *obj, void *_pd __UNUSED__,
|
|||
va_list *list EINA_UNUSED)
|
||||
{
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
elm_widget_can_focus_set(obj, EINA_FALSE);
|
||||
|
||||
if (!elm_layout_theme_set
|
||||
|
|
|
@ -798,8 +798,7 @@ _elm_slider_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
|||
Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
|
||||
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
|
||||
priv->horizontal = EINA_TRUE;
|
||||
priv->indicator_show = EINA_TRUE;
|
||||
|
|
|
@ -313,16 +313,15 @@ _item_del_pre_hook(Elm_Object_Item *it)
|
|||
static void
|
||||
_elm_slideshow_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
||||
{
|
||||
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
Elm_Slideshow_Smart_Data *priv = _pd;
|
||||
Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
|
||||
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
|
||||
priv->count_item_pre_before = 2;
|
||||
priv->count_item_pre_after = 2;
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
|
||||
if (!elm_layout_theme_set
|
||||
(obj, "slideshow", "base", elm_widget_style_get(obj)))
|
||||
CRITICAL("Failed to set layout!");
|
||||
|
|
|
@ -658,8 +658,7 @@ _elm_spinner_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
|||
Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
|
||||
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
|
||||
priv->val_max = 100.0;
|
||||
priv->step = 1.0;
|
||||
|
|
|
@ -185,7 +185,7 @@ _elm_table_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
|
|||
{
|
||||
Evas_Object *table;
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
|
||||
table = evas_object_table_add(evas_object_evas_get(obj));
|
||||
elm_widget_resize_object_set(obj, table);
|
||||
|
|
|
@ -598,8 +598,7 @@ _elm_thumb_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
|
|||
Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
|
||||
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
elm_widget_resize_object_set(obj, elm_layout_add(obj));
|
||||
|
||||
if (!elm_layout_theme_set(wd->resize_obj, "thumb", "base",
|
||||
|
|
|
@ -2491,7 +2491,7 @@ _elm_toolbar_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
|||
Elm_Toolbar_Smart_Data *priv = _pd;
|
||||
Evas_Object *edje;
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
|
||||
edje = edje_object_add(evas_object_evas_get(obj));
|
||||
elm_widget_resize_object_set(obj, edje);
|
||||
|
|
|
@ -250,8 +250,7 @@ _elm_video_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
|
|||
_elm_emotion_init();
|
||||
|
||||
eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
elm_widget_can_focus_set(obj, EINA_TRUE);
|
||||
|
||||
#ifdef HAVE_EMOTION
|
||||
|
|
|
@ -242,7 +242,7 @@ _view_smart_add(Evas_Object *obj)
|
|||
{
|
||||
View_Smart_Data *sd;
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
|
||||
sd = calloc(1, sizeof(View_Smart_Data));
|
||||
evas_object_smart_data_set(obj, sd);
|
||||
|
|
|
@ -37,8 +37,7 @@ _view_smart_add(Evas_Object *obj)
|
|||
|
||||
sd = calloc(1, sizeof(View_Smart_Data));
|
||||
evas_object_smart_data_set(obj, sd);
|
||||
|
||||
elm_widget_sub_object_add(eo_parent_get(obj), obj);
|
||||
elm_widget_sub_object_parent_add(obj);
|
||||
|
||||
_ewk_view_parent_sc.sc.add(obj);
|
||||
}
|
||||
|
|
|
@ -952,6 +952,18 @@ _elm_widget_on_show_region_hook_set(Eo *obj EINA_UNUSED, void *_pd, va_list *lis
|
|||
sd->on_show_region_data = data;
|
||||
}
|
||||
|
||||
EAPI Eina_Bool
|
||||
elm_widget_sub_object_parent_add(Evas_Object *sobj)
|
||||
{
|
||||
Eina_Bool ret = EINA_FALSE;
|
||||
Eo *parent;
|
||||
|
||||
eo_do(sobj, eo_parent_get(&parent));
|
||||
eo_do(parent, elm_wdg_sub_object_add(sobj, &ret));
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
EAPI Eina_Bool
|
||||
elm_widget_sub_object_add(Evas_Object *obj,
|
||||
Evas_Object *sobj)
|
||||
|
@ -963,7 +975,7 @@ elm_widget_sub_object_add(Evas_Object *obj,
|
|||
|
||||
Eina_Bool ret = EINA_FALSE;
|
||||
eo_do(obj, elm_wdg_sub_object_add(sobj, &ret));
|
||||
|
||||
// FIXME: better handle the error case in the eo called function than here.
|
||||
if (ret) return EINA_TRUE;
|
||||
|
||||
err:
|
||||
|
@ -6120,12 +6132,15 @@ elm_widget_tree_dot_dump(const Evas_Object *top,
|
|||
static void
|
||||
_constructor(Eo *obj, void *class_data EINA_UNUSED, va_list *list EINA_UNUSED)
|
||||
{
|
||||
Eo *parent;
|
||||
ELM_WIDGET_DATA_GET(obj, sd);
|
||||
|
||||
sd->on_create = EINA_TRUE;
|
||||
eo_do_super(obj, MY_CLASS, eo_constructor());
|
||||
eo_do(obj, evas_obj_type_set(MY_CLASS_NAME));
|
||||
eo_do(obj, elm_wdg_parent_set(eo_parent_get(obj)));
|
||||
eo_do(obj,
|
||||
evas_obj_type_set(MY_CLASS_NAME),
|
||||
eo_parent_get(&parent));
|
||||
eo_do(obj, elm_wdg_parent_set(parent));
|
||||
sd->on_create = EINA_FALSE;
|
||||
}
|
||||
|
||||
|
|
|
@ -601,6 +601,7 @@ EAPI Eina_Bool elm_widget_theme(Evas_Object *obj);
|
|||
EAPI void elm_widget_theme_specific(Evas_Object *obj, Elm_Theme *th, Eina_Bool force);
|
||||
EAPI void elm_widget_translate(Evas_Object *obj);
|
||||
EAPI void elm_widget_on_show_region_hook_set(Evas_Object *obj, void (*func)(void *data, Evas_Object *obj), void *data);
|
||||
EAPI Eina_Bool elm_widget_sub_object_parent_add(Evas_Object *sobj);
|
||||
EAPI Eina_Bool elm_widget_sub_object_add(Evas_Object *obj, Evas_Object *sobj);
|
||||
EAPI Eina_Bool elm_widget_sub_object_del(Evas_Object *obj, Evas_Object *sobj);
|
||||
EAPI void elm_widget_resize_object_set(Evas_Object *obj, Evas_Object *sobj);
|
||||
|
|
|
@ -2764,13 +2764,15 @@ _win_constructor(Eo *obj, void *_pd, va_list *list)
|
|||
|
||||
const char *name = va_arg(*list, const char *);
|
||||
Elm_Win_Type type = va_arg(*list, Elm_Win_Type);
|
||||
Evas_Object *parent = eo_parent_get(obj);
|
||||
Evas_Object *parent;
|
||||
Evas *e;
|
||||
const Eina_List *l;
|
||||
const char *fontpath, *fallback = NULL;
|
||||
|
||||
Elm_Win_Smart_Data tmp_sd;
|
||||
|
||||
eo_do(obj, eo_parent_get(&parent));
|
||||
|
||||
/* just to store some data while trying out to create a canvas */
|
||||
memset(&tmp_sd, 0, sizeof(Elm_Win_Smart_Data));
|
||||
|
||||
|
@ -2959,7 +2961,7 @@ _win_constructor(Eo *obj, void *_pd, va_list *list)
|
|||
return;
|
||||
}
|
||||
|
||||
eo_parent_set(obj, ecore_evas_get(tmp_sd.ee));
|
||||
eo_do(obj, eo_parent_set(ecore_evas_get(tmp_sd.ee)));
|
||||
eo_do_super(obj, MY_CLASS, eo_constructor());
|
||||
eo_do(obj,
|
||||
evas_obj_type_set(MY_CLASS_NAME),
|
||||
|
|
Loading…
Reference in New Issue