[elm_conform]: content area get removed instead content_set is used, popup can use...

diff --git a/src/lib/elm_conform.c b/src/lib/elm_conform.c
index 6c5ced0..6394c37 100644 (file)
--- a/src/lib/elm_conform.c
+++ b/src/lib/elm_conform.c
@@ -16,7 +16,6 @@ struct _Widget_Data
    Evas_Object *shelf, *panel, *virtualkeypad, *sliding_win;
    Evas_Object *content;
    Evas_Object *scroller;
-   Evas_Object *layout;
    int is_sliding_win_visible;
 #ifdef HAVE_ELEMENTARY_X
    Ecore_Event_Handler *prop_hdl;
@@ -618,7 +617,7 @@ _prop_change(void *data, int type __UNUSED__, void *event)
 EAPI Evas_Object *
 elm_conformant_add(Evas_Object *parent)
 {
-   Evas_Object *obj;
+   Evas_Object *obj, *content;
    Evas *e;
    Widget_Data *wd;
 
@@ -640,9 +639,9 @@ elm_conformant_add(Evas_Object *parent)
    _elm_theme_object_set(obj, wd->base, "conformant", "base", "default");
    elm_widget_resize_object_set(obj, wd->base);
 
-   wd->layout = elm_layout_add(obj);
-   edje_object_part_swallow(wd->base, "elm.swallow.content", wd->layout);
-   elm_layout_theme_set(wd->layout, "conformant", "layout", "content");
+   content = elm_layout_add(obj);
+   elm_layout_theme_set(content, "conformant", "layout", "content");
+   elm_object_content_set(obj, content);
 
    _swallow_conformant_parts(obj);
 
@@ -663,23 +662,10 @@ elm_conformant_add(Evas_Object *parent)
                                        _conformant_move_resize_event_cb, obj);
    evas_object_event_callback_add(obj, EVAS_CALLBACK_MOVE,
                                        _conformant_move_resize_event_cb, obj);
-   evas_object_smart_callback_add(wd->layout, "sub-object-del", _sub_del, obj);
+   evas_object_smart_callback_add(obj, "sub-object-del", _sub_del, obj);
 
 
    _mirrored_set(obj, elm_widget_mirrored_get(obj));
    _sizing_eval(obj);
    return obj;
 }
-
-EINA_DEPRECATED EAPI Evas_Object *
-elm_conformant_content_area_get(const Evas_Object *obj)
-{
-   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
-   Widget_Data *wd = elm_widget_data_get(obj);
-
-   if (!wd) return NULL;
-   /*Finger waggle warning*/
-   _elm_dangerous_call_check(__FUNCTION__);
-
-   return wd->layout;
-}

diff --git a/src/lib/elm_deprecated.h b/src/lib/elm_deprecated.h
index d28a776..dda9da9 100644 (file)
--- a/src/lib/elm_deprecated.h
+++ b/src/lib/elm_deprecated.h
@@ -5403,15 +5403,6 @@ EINA_DEPRECATED EAPI Eina_Bool             elm_win_transparent_get(const Evas_Ob
 EINA_DEPRECATED EAPI void             elm_theme_all_set(const char *theme);
 
 /**
- * Returns the Evas_Object that represents the content area.
- *
- * @param obj The conformant object.
- * @return The content area of the widget.
- *
- */
-EINA_DEPRECATED EAPI Evas_Object                 *elm_conformant_content_area_get(const Evas_Object *obj);
-
-/**
  * Set if the object is (up/down) resizable.
  *
  * @param obj The image object

diff --git a/src/lib/elm_removed.h b/src/lib/elm_removed.h
index 70b7969..39560b2 100644 (file)
--- a/src/lib/elm_removed.h
+++ b/src/lib/elm_removed.h
@@ -1345,6 +1345,16 @@ EINA_DEPRECATED EAPI Evas_Object *elm_conformant_content_get(const Evas_Object *
 EINA_DEPRECATED EAPI Evas_Object *elm_conformant_content_unset(Evas_Object *obj);
 
 /**
+ * Returns the Evas_Object that represents the content area.
+ *
+ * @param obj The conformant object.
+ * @return The content area of the widget.
+ *
+ * @deprecated use elm_object_content_get() instead
+ */
+EINA_DEPRECATED EAPI Evas_Object                 *elm_conformant_content_area_get(const Evas_Object *obj);
+
+/**
  * Get the side labels max length.
  *
  * @deprecated use elm_diskselector_side_label_length_get() instead: