elm conform: Reviewed conformant.

Signed-off-by: Daniel Juyung Seo <seojuyung@gmail.com>
git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@68643 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in
index ffdad9c..9da5102 100644 (file)
--- a/src/lib/Elementary.h.in
+++ b/src/lib/Elementary.h.in
@@ -187,7 +187,7 @@ EAPI extern Elm_Version *elm_version;
 #include <elm_cnp.h> // XXX: comments in elm_cnp.h
 #include <elm_colorselector.h> // OK
 #include <elm_config.h>
-#include <elm_conform.h>
+#include <elm_conform.h> // XXX: comments in elm_conform.h
 #include <elm_cursor.h> // XXX: comments in elm_cursor.h. review was not finished.
 #include <elm_debug.h> // OK
 #include <elm_diskselector.h>

diff --git a/src/lib/elm_conform.c b/src/lib/elm_conform.c
index 802dbc6..97cfb38 100644 (file)
--- a/src/lib/elm_conform.c
+++ b/src/lib/elm_conform.c
@@ -605,6 +605,7 @@ elm_conformant_add(Evas_Object *parent)
    elm_widget_resize_object_set(obj, wd->base);
 
    _swallow_conformant_parts(obj);
+
 #ifdef HAVE_ELEMENTARY_X
    Evas_Object *top = elm_widget_top_get(obj);
    Ecore_X_Window xwin = elm_win_xwindow_get(top);
@@ -616,8 +617,8 @@ elm_conformant_add(Evas_Object *parent)
         wd->vkb_state = ECORE_X_VIRTUAL_KEYBOARD_STATE_OFF;
      }
    // FIXME: get kbd region prop
-
 #endif
+
    evas_object_event_callback_add(obj, EVAS_CALLBACK_RESIZE,
                                        _conformant_move_resize_event_cb, obj);
    evas_object_event_callback_add(obj, EVAS_CALLBACK_MOVE,
@@ -630,19 +631,19 @@ elm_conformant_add(Evas_Object *parent)
    return obj;
 }
 
-EAPI void
+EINA_DEPRECATED EAPI void
 elm_conformant_content_set(Evas_Object *obj, Evas_Object *content)
 {
    _content_set_hook(obj, NULL, content);
 }
 
-EAPI Evas_Object *
+EINA_DEPRECATED EAPI Evas_Object *
 elm_conformant_content_get(const Evas_Object *obj)
 {
    return _content_get_hook(obj, NULL);
 }
 
-EAPI Evas_Object *
+EINA_DEPRECATED EAPI Evas_Object *
 elm_conformant_content_unset(Evas_Object *obj)
 {
    return _content_unset_hook(obj, NULL);

diff --git a/src/lib/elm_conform.h b/src/lib/elm_conform.h
index 992c59c..2be6cff 100644 (file)
--- a/src/lib/elm_conform.h
+++ b/src/lib/elm_conform.h
@@ -52,6 +52,7 @@ EAPI Evas_Object                 *elm_conformant_add(Evas_Object *parent);
  *
  * @ingroup Conformant
  */
+// XXX: why is this API needed? use elm_object_content_get() instead??
 EAPI Evas_Object                 *elm_conformant_content_area_get(const Evas_Object *obj);
 
 /**