dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

elm conform: Reviewed conformant. 

Signed-off-by: Daniel Juyung Seo <seojuyung@gmail.com>

SVN revision: 68643
This commit is contained in:
Daniel Juyung Seo 2012-03-03 06:12:09 +00:00 committed by Daniel Juyung Seo
parent de7fa17f92
commit cdbec605cf
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
legacy/elementary/src/lib/Elementary.h.in
View File

@ -187,7 +187,7 @@ EAPI extern Elm_Version *elm_version;
#include <elm_cnp.h> // XXX: comments in elm_cnp.h #include <elm_cnp.h> // XXX: comments in elm_cnp.h
#include <elm_colorselector.h> // OK #include <elm_colorselector.h> // OK
#include <elm_config.h> #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_cursor.h> // XXX: comments in elm_cursor.h. review was not finished.
#include <elm_debug.h> // OK #include <elm_debug.h> // OK
#include <elm_diskselector.h> #include <elm_diskselector.h>

9
legacy/elementary/src/lib/elm_conform.c
View File

@ -605,6 +605,7 @@ elm_conformant_add(Evas_Object *parent)
elm_widget_resize_object_set(obj, wd->base); elm_widget_resize_object_set(obj, wd->base);
_swallow_conformant_parts(obj); _swallow_conformant_parts(obj);
#ifdef HAVE_ELEMENTARY_X #ifdef HAVE_ELEMENTARY_X
Evas_Object *top = elm_widget_top_get(obj); Evas_Object *top = elm_widget_top_get(obj);
Ecore_X_Window xwin = elm_win_xwindow_get(top); 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; wd->vkb_state = ECORE_X_VIRTUAL_KEYBOARD_STATE_OFF;
} }
// FIXME: get kbd region prop // FIXME: get kbd region prop
#endif #endif
evas_object_event_callback_add(obj, EVAS_CALLBACK_RESIZE, evas_object_event_callback_add(obj, EVAS_CALLBACK_RESIZE,
_conformant_move_resize_event_cb, obj); _conformant_move_resize_event_cb, obj);
evas_object_event_callback_add(obj, EVAS_CALLBACK_MOVE, evas_object_event_callback_add(obj, EVAS_CALLBACK_MOVE,
@ -630,19 +631,19 @@ elm_conformant_add(Evas_Object *parent)
return obj; return obj;
} }
EAPI void EINA_DEPRECATED EAPI void
elm_conformant_content_set(Evas_Object *obj, Evas_Object *content) elm_conformant_content_set(Evas_Object *obj, Evas_Object *content)
{ {
_content_set_hook(obj, NULL, content); _content_set_hook(obj, NULL, content);
} }
EAPI Evas_Object * EINA_DEPRECATED EAPI Evas_Object *
elm_conformant_content_get(const Evas_Object *obj) elm_conformant_content_get(const Evas_Object *obj)
{ {
return _content_get_hook(obj, NULL); return _content_get_hook(obj, NULL);
} }
EAPI Evas_Object * EINA_DEPRECATED EAPI Evas_Object *
elm_conformant_content_unset(Evas_Object *obj) elm_conformant_content_unset(Evas_Object *obj)
{ {
return _content_unset_hook(obj, NULL); return _content_unset_hook(obj, NULL);

1
legacy/elementary/src/lib/elm_conform.h
View File

@ -52,6 +52,7 @@ EAPI Evas_Object *elm_conformant_add(Evas_Object *parent);
* *
* @ingroup Conformant * @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); EAPI Evas_Object *elm_conformant_content_area_get(const Evas_Object *obj);
/** /**