Eolian: Integration of Container

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index a6b6ca3..ee0633e 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -3,7 +3,8 @@ MAINTAINERCLEANFILES = Makefile.in
 
 CLEANFILES=
 
-EOLIAN_FLAGS = @DEPS_EOLIAN_FLAGS@
+EOLIAN_FLAGS = @DEPS_EOLIAN_FLAGS@ \
+              -I$(top_srcdir)/src/lib
 
 include $(top_srcdir)/Makefile_Eolian_Helper.am
 
@@ -524,11 +525,15 @@ elm_intro.h.in
 
 BUILT_SOURCES = \
                elm_widget.eo.c \
-               elm_widget.eo.h
+               elm_widget.eo.h \
+               elm_container.eo.c \
+               elm_container.eo.h
 
 EXTRA_DIST += \
-            elm_widget.eo
+            elm_widget.eo \
+            elm_container.eo
 
 nodist_includesunstable_HEADERS = \
-                                 elm_widget.eo.h
+                                 elm_widget.eo.h \
+                                 elm_container.eo.h
 

diff --git a/src/lib/elm_container.c b/src/lib/elm_container.c
index 1d4d67b..04f3bbc 100644 (file)
--- a/src/lib/elm_container.c
+++ b/src/lib/elm_container.c
@@ -6,29 +6,8 @@
 #include "elm_priv.h"
 #include "elm_widget_container.h"
 
-EAPI Eo_Op ELM_OBJ_CONTAINER_BASE_ID = EO_NOOP;
-
 #define MY_CLASS ELM_OBJ_CONTAINER_CLASS
 
 #define MY_CLASS_NAME "Elm_Container"
 
-static const Eo_Op_Description op_desc[] = {
-     EO_OP_DESCRIPTION(ELM_OBJ_CONTAINER_SUB_ID_CONTENT_SET, "Set the content on part of a given container widget."),
-     EO_OP_DESCRIPTION(ELM_OBJ_CONTAINER_SUB_ID_CONTENT_GET, "Get the content on a part of a given container widget"),
-     EO_OP_DESCRIPTION(ELM_OBJ_CONTAINER_SUB_ID_CONTENT_UNSET, "Unset the content on a part of a given container widget"),
-     EO_OP_DESCRIPTION(ELM_OBJ_CONTAINER_SUB_ID_CONTENT_SWALLOW_LIST_GET, "Get the list of swallow parts of a given container widget"),
-     EO_OP_DESCRIPTION_SENTINEL
-};
-
-static const Eo_Class_Description class_desc = {
-     EO_VERSION,
-     MY_CLASS_NAME,
-     EO_CLASS_TYPE_REGULAR,
-     EO_CLASS_DESCRIPTION_OPS(&ELM_OBJ_CONTAINER_BASE_ID, op_desc, ELM_OBJ_CONTAINER_SUB_ID_LAST),
-     NULL,
-     0,
-     NULL,
-     NULL
-};
-
-EO_DEFINE_CLASS(elm_obj_container_class_get, &class_desc, ELM_OBJ_WIDGET_CLASS, NULL);
+#include "elm_container.eo.c"

diff --git a/src/lib/elm_container.eo b/src/lib/elm_container.eo
new file mode 100644 (file)
index 0000000..6f0f8e8
--- /dev/null
+++ b/src/lib/elm_container.eo
@@ -0,0 +1,50 @@
+class Elm_Container (Elm_Widget)
+{
+   eo_prefix: elm_obj_container;
+   data: null;
+   properties {
+      content_swallow_list {
+         get {
+            /*@ No description supplied by the EAPI. */
+            legacy null;
+         }
+         values {
+            Eina_List *ret; /*@ Eina_List */
+         }
+      }
+   }
+   methods {
+      content_set {
+         /*@ No description supplied by the EAPI. */
+         params {
+            @in const char *name;
+            @in Evas_Object *content;
+         }
+         return Eina_Bool;
+         legacy null;
+      }
+      content_get {
+         /*@ No description supplied by the EAPI. */
+         params {
+            @in const char *name;
+         }
+         return Evas_Object *;
+         legacy null;
+      }
+      content_unset {
+         /*@ No description supplied by the EAPI. */
+         params {
+            @in const char *name;
+         }
+         return Evas_Object *;
+         legacy null;
+      }
+   }
+   implements {
+      virtual::content_set;
+      virtual::content_unset;
+      virtual::content_get;
+      virtual::content_swallow_list::get;
+   }
+
+}

diff --git a/src/lib/elm_widget_container.h b/src/lib/elm_widget_container.h
index 2e1d378..e1edf87 100644 (file)
--- a/src/lib/elm_widget_container.h
+++ b/src/lib/elm_widget_container.h
@@ -30,6 +30,9 @@
  * - elm_object_part_content_unset()
  */
 
+#include "elm_container.eo.h"
+
+#if 0
 #define ELM_OBJ_CONTAINER_CLASS elm_obj_container_class_get()
 
 const Eo_Class *elm_obj_container_class_get(void) EINA_CONST;
@@ -100,3 +103,5 @@ enum
 #define elm_obj_container_content_swallow_list_get(ret) ELM_OBJ_CONTAINER_ID(ELM_OBJ_CONTAINER_SUB_ID_CONTENT_SWALLOW_LIST_GET), EO_TYPECHECK(Eina_List **,ret)
 
 #endif
+
+#endif