summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/Makefile_Elementary.am15
-rw-r--r--src/lib/elementary/efl_ui_bg.c4
-rw-r--r--src/lib/elementary/efl_ui_bg.eo1
-rw-r--r--src/lib/elementary/efl_ui_bg_eo.legacy.h17
-rw-r--r--src/lib/elementary/efl_ui_bg_legacy.eo14
-rw-r--r--src/lib/elementary/efl_ui_bg_legacy_eo.c35
-rw-r--r--src/lib/elementary/efl_ui_bg_legacy_eo.h32
-rw-r--r--src/lib/elementary/efl_ui_bg_legacy_eo.legacy.h17
-rw-r--r--src/lib/elementary/elm_bg_legacy.h2
-rw-r--r--src/lib/elementary/meson.build4
10 files changed, 119 insertions, 22 deletions
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index ddc2db7a51..190803c6f9 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -189,7 +189,6 @@ elm_legacy_eolian_files = \
lib/elementary/efl_ui_button_legacy.eo \
lib/elementary/efl_ui_check_legacy.eo \
lib/elementary/efl_ui_radio_legacy.eo \
- lib/elementary/efl_ui_bg_legacy.eo \
lib/elementary/efl_ui_video_legacy.eo \
lib/elementary/efl_ui_frame_legacy.eo \
lib/elementary/efl_ui_panes_legacy.eo \
@@ -326,14 +325,24 @@ elementaryeolianfiles_DATA = $(elm_public_eolian_files) $(elm_eolian_type_files)
noinst_DATA += $(elm_legacy_eolian_eo_h)
-EXTRA_DIST2 += ${elementaryeolianfiles_DATA} $(elm_legacy_eolian_files) $(elm_private_eolian_files)
+elm_legacy_eo_files = \
+lib/elementary/efl_ui_bg_legacy_eo.c
+
+elm_legacy_eo_headers = \
+lib/elementary/efl_ui_bg_eo.legacy.h \
+lib/elementary/efl_ui_bg_legacy_eo.h \
+lib/elementary/efl_ui_bg_legacy_eo.legacy.h
+
+
+EXTRA_DIST2 += ${elementaryeolianfiles_DATA} $(elm_legacy_eolian_files) $(elm_private_eolian_files) $(elm_legacy_eo_files)
lib_LTLIBRARIES += lib/elementary/libelementary.la
includes_HEADERS = \
lib/elementary/Elementary.h \
lib/elementary/Elementary_Options.h \
-lib/elementary/Elementary_Cursor.h
+lib/elementary/Elementary_Cursor.h \
+$(elm_legacy_eo_headers)
includesdir = $(includedir)/elementary-@VMAJ@
includesunstable_HEADERS = \
diff --git a/src/lib/elementary/efl_ui_bg.c b/src/lib/elementary/efl_ui_bg.c
index ad7b69e2f8..aea33a086a 100644
--- a/src/lib/elementary/efl_ui_bg.c
+++ b/src/lib/elementary/efl_ui_bg.c
@@ -292,7 +292,7 @@ ELM_LAYOUT_CONTENT_ALIASES_IMPLEMENT(MY_CLASS_PFX)
#include "efl_ui_bg.eo.c"
-#include "efl_ui_bg_legacy.eo.h"
+#include "efl_ui_bg_legacy_eo.h"
#define MY_CLASS_NAME_LEGACY "elm_bg"
@@ -320,4 +320,4 @@ elm_bg_add(Evas_Object *parent)
return elm_legacy_add(EFL_UI_BG_LEGACY_CLASS, parent);
}
-#include "efl_ui_bg_legacy.eo.c"
+#include "efl_ui_bg_legacy_eo.c"
diff --git a/src/lib/elementary/efl_ui_bg.eo b/src/lib/elementary/efl_ui_bg.eo
index 0094f8c951..bc0ef7efed 100644
--- a/src/lib/elementary/efl_ui_bg.eo
+++ b/src/lib/elementary/efl_ui_bg.eo
@@ -5,7 +5,6 @@ class @beta Efl.Ui.Bg extends Efl.Ui.Layout_Base implements Efl.File, Efl.Gfx.Co
works just like an image, but has some properties useful for backgrounds, such as
setting it to tiled, centered, scaled or stretched.
]]
- legacy_prefix: elm_bg;
implements {
Efl.Object.constructor;
Efl.Object.destructor;
diff --git a/src/lib/elementary/efl_ui_bg_eo.legacy.h b/src/lib/elementary/efl_ui_bg_eo.legacy.h
new file mode 100644
index 0000000000..8ad9bcd1f5
--- /dev/null
+++ b/src/lib/elementary/efl_ui_bg_eo.legacy.h
@@ -0,0 +1,17 @@
+#ifndef _EFL_UI_BG_EO_LEGACY_H_
+#define _EFL_UI_BG_EO_LEGACY_H_
+
+#ifndef _EFL_UI_BG_EO_CLASS_TYPE
+#define _EFL_UI_BG_EO_CLASS_TYPE
+
+typedef Eo Efl_Ui_Bg;
+
+#endif
+
+#ifndef _EFL_UI_BG_EO_TYPES
+#define _EFL_UI_BG_EO_TYPES
+
+
+#endif
+
+#endif
diff --git a/src/lib/elementary/efl_ui_bg_legacy.eo b/src/lib/elementary/efl_ui_bg_legacy.eo
deleted file mode 100644
index cc681b0b8e..0000000000
--- a/src/lib/elementary/efl_ui_bg_legacy.eo
+++ /dev/null
@@ -1,14 +0,0 @@
-class @beta Efl.Ui.Bg_Legacy extends Efl.Ui.Bg implements Efl.Ui.Legacy
-{
- [[The bg (background) widget is used for setting (solid) background decorations
-
- for a window (unless it has transparency enabled) or for any container object. It
- works just like an image, but has some properties useful for backgrounds, such as
- setting it to tiled, centered, scaled or stretched.
- ]]
- data: null;
- implements {
- class.constructor;
- Efl.Object.constructor;
- }
-}
diff --git a/src/lib/elementary/efl_ui_bg_legacy_eo.c b/src/lib/elementary/efl_ui_bg_legacy_eo.c
new file mode 100644
index 0000000000..9cd23ff42f
--- /dev/null
+++ b/src/lib/elementary/efl_ui_bg_legacy_eo.c
@@ -0,0 +1,35 @@
+
+Efl_Object *_efl_ui_bg_legacy_efl_object_constructor(Eo *obj, void *pd);
+
+
+static Eina_Bool
+_efl_ui_bg_legacy_class_initializer(Efl_Class *klass)
+{
+ const Efl_Object_Ops *opsp = NULL;
+
+ const Efl_Object_Property_Reflection_Ops *ropsp = NULL;
+
+#ifndef EFL_UI_BG_LEGACY_EXTRA_OPS
+#define EFL_UI_BG_LEGACY_EXTRA_OPS
+#endif
+
+ EFL_OPS_DEFINE(ops,
+ EFL_OBJECT_OP_FUNC(efl_constructor, _efl_ui_bg_legacy_efl_object_constructor),
+ EFL_UI_BG_LEGACY_EXTRA_OPS
+ );
+ opsp = &ops;
+
+ return efl_class_functions_set(klass, opsp, ropsp);
+}
+
+static const Efl_Class_Description _efl_ui_bg_legacy_class_desc = {
+ EO_VERSION,
+ "Efl.Ui.Bg_Legacy",
+ EFL_CLASS_TYPE_REGULAR,
+ 0,
+ _efl_ui_bg_legacy_class_initializer,
+ _efl_ui_bg_legacy_class_constructor,
+ NULL
+};
+
+EFL_DEFINE_CLASS(efl_ui_bg_legacy_class_get, &_efl_ui_bg_legacy_class_desc, EFL_UI_BG_CLASS, EFL_UI_LEGACY_INTERFACE, NULL);
diff --git a/src/lib/elementary/efl_ui_bg_legacy_eo.h b/src/lib/elementary/efl_ui_bg_legacy_eo.h
new file mode 100644
index 0000000000..ea3641dc2e
--- /dev/null
+++ b/src/lib/elementary/efl_ui_bg_legacy_eo.h
@@ -0,0 +1,32 @@
+#ifndef _EFL_UI_BG_LEGACY_EO_H_
+#define _EFL_UI_BG_LEGACY_EO_H_
+
+#ifndef _EFL_UI_BG_LEGACY_EO_CLASS_TYPE
+#define _EFL_UI_BG_LEGACY_EO_CLASS_TYPE
+
+typedef Eo Efl_Ui_Bg_Legacy;
+
+#endif
+
+#ifndef _EFL_UI_BG_LEGACY_EO_TYPES
+#define _EFL_UI_BG_LEGACY_EO_TYPES
+
+
+#endif
+#ifdef EFL_BETA_API_SUPPORT
+/**
+ * @brief The bg (background) widget is used for setting (solid) background
+ * decorations
+ *
+ * for a window (unless it has transparency enabled) or for any container
+ * object. It works just like an image, but has some properties useful for
+ * backgrounds, such as setting it to tiled, centered, scaled or stretched.
+ *
+ * @ingroup Efl_Ui_Bg_Legacy
+ */
+#define EFL_UI_BG_LEGACY_CLASS efl_ui_bg_legacy_class_get()
+
+EWAPI const Efl_Class *efl_ui_bg_legacy_class_get(void);
+#endif /* EFL_BETA_API_SUPPORT */
+
+#endif
diff --git a/src/lib/elementary/efl_ui_bg_legacy_eo.legacy.h b/src/lib/elementary/efl_ui_bg_legacy_eo.legacy.h
new file mode 100644
index 0000000000..7498da1144
--- /dev/null
+++ b/src/lib/elementary/efl_ui_bg_legacy_eo.legacy.h
@@ -0,0 +1,17 @@
+#ifndef _EFL_UI_BG_LEGACY_EO_LEGACY_H_
+#define _EFL_UI_BG_LEGACY_EO_LEGACY_H_
+
+#ifndef _EFL_UI_BG_LEGACY_EO_CLASS_TYPE
+#define _EFL_UI_BG_LEGACY_EO_CLASS_TYPE
+
+typedef Eo Efl_Ui_Bg_Legacy;
+
+#endif
+
+#ifndef _EFL_UI_BG_LEGACY_EO_TYPES
+#define _EFL_UI_BG_LEGACY_EO_TYPES
+
+
+#endif
+
+#endif
diff --git a/src/lib/elementary/elm_bg_legacy.h b/src/lib/elementary/elm_bg_legacy.h
index ee50dd9d6b..54f6b6aaf1 100644
--- a/src/lib/elementary/elm_bg_legacy.h
+++ b/src/lib/elementary/elm_bg_legacy.h
@@ -165,4 +165,4 @@ EAPI Elm_Bg_Option elm_bg_option_get(const Evas_Object *obj);
*/
EAPI void elm_bg_load_size_set(Evas_Object *obj, int w, int h);
-#include "efl_ui_bg.eo.legacy.h"
+#include "efl_ui_bg_eo.legacy.h"
diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build
index 6a672e4d00..3964bb0f9b 100644
--- a/src/lib/elementary/meson.build
+++ b/src/lib/elementary/meson.build
@@ -2,7 +2,6 @@ pub_legacy_eo_files = [
'efl_ui_button_legacy.eo',
'efl_ui_check_legacy.eo',
'efl_ui_radio_legacy.eo',
- 'efl_ui_bg_legacy.eo',
'efl_ui_video_legacy.eo',
'efl_ui_frame_legacy.eo',
'efl_ui_panes_legacy.eo',
@@ -697,6 +696,9 @@ elementary_pub_headers = [
'elm_win_legacy.h',
'elm_helper.h',
'elm_part_helper.h',
+ 'efl_ui_bg_eo.legacy.h',
+ 'efl_ui_bg_legacy_eo.h',
+ 'efl_ui_bg_legacy_eo.legacy.h',
]
elementary_header_src = [
View Lorry Controller Status