#include <Elementary.h>
-#include "eobj.h"
+#include "Eobj.h"
#include "evas_obj.h"
#include "elw_box.h"
+#include "config.h"
+
EAPI Eobj_Op ELW_BOX_BASE_ID = 0;
typedef struct
Evas_Object *bx;
} Widget_Data;
-static Eobj_Class *_my_class = NULL;
+static const Eobj_Class *_my_class = NULL;
static void
-_pack_end(Eobj *obj, Eobj_Op op, va_list *list)
+_pack_end(Eobj *obj EINA_UNUSED, void *class_data, va_list *list)
{
- Widget_Data *wd = eobj_data_get(obj, _my_class);
- (void) op;
+ Widget_Data *wd = class_data;
Eobj *child_obj;
child_obj = va_arg(*list, Eobj *);
/* FIXME: Ref and the later uref child_obj here... */
}
static void
-_constructor(Eobj *obj)
+_constructor(Eobj *obj, void *class_data)
{
eobj_constructor_super(obj);
- Widget_Data *wd = eobj_data_get(obj, _my_class);
+ Widget_Data *wd = class_data;
/* FIXME: An hack, because our tree is not yet only Eobj */
wd->bx = elm_box_add(eobj_evas_object_get(eobj_parent_get(obj)));
}
static void
-_destructor(Eobj *obj)
-{
- eobj_destructor_super(obj);
-
- //Widget_Data *wd = eobj_data_get(obj, _my_class);
- /* FIXME: Commented out because it's automatically done because our tree
- * is not made of only eobj */
-// evas_object_del(wd->bx);
-}
-
-static void
_class_constructor(Eobj_Class *klass)
{
const Eobj_Op_Func_Description func_desc[] = {
- EOBJ_OP_FUNC_DESCRIPTION(ELW_BOX_ID(ELW_BOX_SUB_ID_PACK_END), _pack_end),
- EOBJ_OP_FUNC_DESCRIPTION_SENTINEL
+ EOBJ_OP_FUNC(ELW_BOX_ID(ELW_BOX_SUB_ID_PACK_END), _pack_end),
+ EOBJ_OP_FUNC_SENTINEL
};
eobj_class_funcs_set(klass, func_desc);
NULL,
sizeof(Widget_Data),
_constructor,
- _destructor,
+ NULL,
_class_constructor,
NULL
};