evas: Mark group_add/del as internal

Lacking a proper internal tag, I'm using both protected (it is
in fact a protected access function) and beta (to mark as unstable,
not real API).

New smart objects based on EO only should rely on constructor,
finalize and destructor exclusively. In theory, this should be fine.

Unfortunately it may be impossible to inherit from the Efl.Ui.Win
class as it uses a really bad hack and calls super.constructor
inside the finalize method.

diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c
index 16a0bbb..5120bce 100644 (file)
--- a/src/lib/edje/edje_edit.c
+++ b/src/lib/edje/edje_edit.c
@@ -8,6 +8,8 @@
  */
 
 #define _EDJE_EDIT_EO_CLASS_TYPE
+#define EFL_CANVAS_GROUP_PROTECTED
+#define EFL_CANVAS_GROUP_BETA
 
 #include "edje_private.h"
 

diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c
index 0a69d5e..7e8105a 100644 (file)
--- a/src/lib/edje/edje_smart.c
+++ b/src/lib/edje/edje_smart.c
@@ -1,3 +1,6 @@
+#define EFL_CANVAS_GROUP_PROTECTED
+#define EFL_CANVAS_GROUP_BETA
+
 #include "edje_private.h"
 
 #include <Eo.h>

diff --git a/src/lib/elementary/elementary_config.h b/src/lib/elementary/elementary_config.h
index b9d1749..16ffd71 100644 (file)
--- a/src/lib/elementary/elementary_config.h
+++ b/src/lib/elementary/elementary_config.h
@@ -9,3 +9,5 @@
 
 #define ELM_CONFIG_ICON_THEME_ELEMENTARY "_Elementary_Icon_Theme"
 #define EFL_CANVAS_OBJECT_PROTECTED
+#define EFL_CANVAS_GROUP_PROTECTED
+#define EFL_CANVAS_GROUP_BETA

diff --git a/src/lib/emotion/emotion_smart.c b/src/lib/emotion/emotion_smart.c
index 9b0338d..16a6677 100644 (file)
--- a/src/lib/emotion/emotion_smart.c
+++ b/src/lib/emotion/emotion_smart.c
@@ -3,6 +3,8 @@
 #endif
 
 #define EFL_CANVAS_OBJECT_PROTECTED
+#define EFL_CANVAS_GROUP_PROTECTED
+#define EFL_CANVAS_GROUP_BETA
 
 #include <Evas.h>
 #include <Ecore.h>

diff --git a/src/lib/evas/canvas/efl_canvas_group.eo b/src/lib/evas/canvas/efl_canvas_group.eo
index a55d83f..9f88181 100644 (file)
--- a/src/lib/evas/canvas/efl_canvas_group.eo
+++ b/src/lib/evas/canvas/efl_canvas_group.eo
@@ -63,16 +63,6 @@ class Efl.Canvas.Group (Efl.Canvas.Object)
          return: free(own(iterator<Efl.Gfx>), eina_iterator_free);
          legacy: evas_object_smart_iterator_new;
       }
-      group_add {
-         [[Instantiates a new smart object described by $s.
-
-           This is the function one should use when defining the public
-           function adding an instance of the new smart object to a given
-           canvas. It will take care of setting all of its internals to work
-           as they should, if the user set things properly, as seem on the
-           #EVAS_SMART_SUBCLASS_NEW, for example.]]
-         legacy: null;
-      }
       group_member_add {
          [[Set an Evas object as a member of a given smart object.
 
@@ -85,8 +75,8 @@ class Efl.Canvas.Group (Efl.Canvas.Object)
            Any $smart_obj object's specific implementation of the
            $member_add() smart function will take place too, naturally.
 
-           See also @.group_member_del.]]
-
+           See also @.group_member_del.
+         ]]
          params {
             @in sub_obj: Efl.Canvas.Object @nonull; [[The member object.]]
          }
@@ -99,15 +89,19 @@ class Efl.Canvas.Group (Efl.Canvas.Object)
            to any. The object will still be on the canvas, but no longer
            associated with whichever smart object it was associated with.
 
-           See also @.group_member_add for more details.]]
-
+           See also @.group_member_add for more details.
+         ]]
          params {
             @in sub_obj: Efl.Canvas.Object; [[the member object.]]
          }
          legacy: null;
       }
-      group_del {
-         [[Deletes a smart object.]]
+      group_add @protected @beta /* @internal */ {
+         [[Internal constructor function.]]
+         legacy: null;
+      }
+      group_del @protected @beta /* @internal */ {
+         [[Internal destructor function.]]
          legacy: null;
       }
    }

diff --git a/src/lib/evas/canvas/evas_object_box.c b/src/lib/evas/canvas/evas_object_box.c
index f2b2f9b..085ee12 100644 (file)
--- a/src/lib/evas/canvas/evas_object_box.c
+++ b/src/lib/evas/canvas/evas_object_box.c
@@ -1,3 +1,6 @@
+#define EFL_CANVAS_GROUP_PROTECTED
+#define EFL_CANVAS_GROUP_BETA
+
 #include "evas_common_private.h"
 #include "evas_private.h"
 

diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c
index af9472d..359fee1 100644 (file)
--- a/src/lib/evas/canvas/evas_object_smart.c
+++ b/src/lib/evas/canvas/evas_object_smart.c
@@ -1,3 +1,6 @@
+#define EFL_CANVAS_GROUP_PROTECTED
+#define EFL_CANVAS_GROUP_BETA
+
 #include "evas_common_private.h"
 #include "evas_private.h"
 

diff --git a/src/lib/evas/canvas/evas_object_smart_clipped.c b/src/lib/evas/canvas/evas_object_smart_clipped.c
index 6b4fcec..b8abd63 100644 (file)
--- a/src/lib/evas/canvas/evas_object_smart_clipped.c
+++ b/src/lib/evas/canvas/evas_object_smart_clipped.c
@@ -1,3 +1,6 @@
+#define EFL_CANVAS_GROUP_PROTECTED
+#define EFL_CANVAS_GROUP_BETA
+
 #include "evas_common_private.h"
 #include "evas_private.h"
 

diff --git a/src/lib/evas/canvas/evas_object_table.c b/src/lib/evas/canvas/evas_object_table.c
index e8b1351..0a23c3c 100644 (file)
--- a/src/lib/evas/canvas/evas_object_table.c
+++ b/src/lib/evas/canvas/evas_object_table.c
@@ -1,4 +1,6 @@
 #define EFL_CANVAS_OBJECT_BETA
+#define EFL_CANVAS_GROUP_PROTECTED
+#define EFL_CANVAS_GROUP_BETA
 
 #include "evas_common_private.h"
 #include "evas_private.h"