evas: Make Efl.Canvas.Object.legacy_ctor internal

Continuing...

diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index ed5fa28..05f0559 100644 (file)
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -8007,6 +8007,7 @@ elm_win_resize_object_del(Eo *obj, Evas_Object *subobj)
      ERR("could not remove sub object %p from window %p", subobj, obj);
 }
 
+
 // deprecated
 EAPI void
 elm_win_name_set(Evas_Object *obj, const char *name)
@@ -8046,4 +8047,8 @@ elm_win_teamwork_uri_open(Efl_Ui_Win *obj EINA_UNUSED, const char *uri EINA_UNUS
    ERR("Calling deprecrated function '%s'", __FUNCTION__);
 }
 
+/* Internal EO APIs */
+#define EFL_UI_WIN_EXTRA_OPS \
+   EFL_OBJECT_OP_FUNC(efl_canvas_object_legacy_ctor, _efl_ui_win_efl_canvas_object_legacy_ctor)
+
 #include "efl_ui_win.eo.c"

diff --git a/src/lib/elementary/efl_ui_win.eo b/src/lib/elementary/efl_ui_win.eo
index 8d1f2aa..b99aa75 100644 (file)
--- a/src/lib/elementary/efl_ui_win.eo
+++ b/src/lib/elementary/efl_ui_win.eo
@@ -966,7 +966,6 @@ class Efl.Ui.Win (Elm.Widget, Efl.Canvas, Elm.Interface.Atspi.Window,
       Efl.Container.content { get; set; }
       Efl.Container.content_unset;
       Efl.Part.part;
-      Efl.Canvas.Object.legacy_ctor;
    }
    constructors {
       .name;

diff --git a/src/lib/evas/Evas_Internal.h b/src/lib/evas/Evas_Internal.h
index 79a1806..e4985b0 100644 (file)
--- a/src/lib/evas/Evas_Internal.h
+++ b/src/lib/evas/Evas_Internal.h
@@ -46,6 +46,11 @@ EAPI Evas_Engine_Info *efl_canvas_output_engine_info_get(Efl_Canvas_Output *outp
 EAPI Eina_Bool efl_canvas_output_lock(Efl_Canvas_Output *output);
 EAPI Eina_Bool efl_canvas_output_unlock(Efl_Canvas_Output *output);
 
+
+/* Internal EO APIs */
+EOAPI void efl_canvas_object_legacy_ctor(Eo *obj);
+
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/src/lib/evas/canvas/efl_canvas_object.eo b/src/lib/evas/canvas/efl_canvas_object.eo
index f8a6063..fde562b 100644 (file)
--- a/src/lib/evas/canvas/efl_canvas_object.eo
+++ b/src/lib/evas/canvas/efl_canvas_object.eo
@@ -8,9 +8,6 @@ abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx, Efl.Gfx.Stack, Efl.Animator,
    legacy_prefix: evas_object;
    data: Evas_Object_Protected_Data;
    methods {
-      legacy_ctor @protected @beta {
-          [[Internal function. Do not use.]]
-      }
       @property type @protected {
          set {
             [[Sets the legacy type name of this Evas object.]]
@@ -620,7 +617,6 @@ abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx, Efl.Gfx.Stack, Efl.Animator,
       }
    }
    constructors {
-      .legacy_ctor;
       .type;
    }
    implements {

diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index c9f5192..11ae1b7 100644 (file)
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -2560,9 +2560,14 @@ evas_object_size_hint_display_mode_get(const Evas_Object *obj)
    return efl_gfx_size_hint_display_mode_get(obj);
 }
 
+/* Internal EO APIs and hidden overrides */
+
+EOAPI EFL_VOID_FUNC_BODY(efl_canvas_object_legacy_ctor)
+
 #define EFL_CANVAS_OBJECT_EXTRA_OPS \
    EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _efl_canvas_object_efl_object_dbg_info_get), \
    EFL_OBJECT_OP_FUNC(efl_event_callback_legacy_call, _efl_canvas_object_efl_object_event_callback_legacy_call), \
-   EFL_OBJECT_OP_FUNC(efl_event_callback_call, _efl_canvas_object_efl_object_event_callback_call)
+   EFL_OBJECT_OP_FUNC(efl_event_callback_call, _efl_canvas_object_efl_object_event_callback_call), \
+   EFL_OBJECT_OP_FUNC(efl_canvas_object_legacy_ctor, _efl_canvas_object_legacy_ctor)
 
 #include "canvas/efl_canvas_object.eo.c"