cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=33f1094fd7b83fce78f0a11a6264a0c521d52daa
commit 33f1094fd7b83fce78f0a11a6264a0c521d52daa
Author: Mike Blumenkrantz <zm...@samsung.com>
Date: Thu Mar 7 10:58:15 2019 -0500
elm: unfuck public headers (only a little)
ideally Elementary.h should include only legacy code (T7667) and Efl_Ui.h
should include only eo code. this is not the case, and fixing it would
require undoing years of careful planning to make this type of thing extra
frustrating
Reviewed-by: Cedric BAIL <cedric.b...@free.fr>
Differential Revision: https://phab.enlightenment.org/D8233
---
src/lib/elementary/Efl_Ui.h | 10 +++++++++-
src/lib/elementary/Elementary.h | 7 +++++--
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/lib/elementary/Efl_Ui.h b/src/lib/elementary/Efl_Ui.h
index bca10e3455..d5db6923d0 100644
--- a/src/lib/elementary/Efl_Ui.h
+++ b/src/lib/elementary/Efl_Ui.h
@@ -8,6 +8,10 @@
# define EFL_EO_API_SUPPORT
#endif
+/* FIXME: wtf? */
+#ifndef EFL_UI_RADIO_EVENT_CHANGED
+# define EFL_UI_RADIO_EVENT_CHANGED EFL_UI_NSTATE_EVENT_CHANGED
+#endif
/* Standard headers for standard system calls etc. */
#include <stdio.h>
#include <stdlib.h>
@@ -189,12 +193,15 @@ EAPI void
efl_ui_focus_relation_free(Efl_Ui_Focus_Relations *rel);
# include <efl_ui_table_static.eo.h>
# include <efl_ui_image.eo.h>
# include <efl_ui_win.eo.h>
+/* FIXME: what the actual fuck. */
+# include <elm_win_eo.h>
# include <efl_ui_win_inlined.eo.h>
# include <efl_ui_win_socket.eo.h>
# include <efl_ui_relative_layout.eo.h>
/* FIXME: Efl.Ui.Text must not use elm_general.h */
-# warning Efl.Ui.Text is not available yet without Elementary.h
+// no.
+//# warning Efl.Ui.Text is not available yet without Elementary.h
# if 0
# include <efl_ui_text_interactive.eo.h>
# include <efl_ui_text.eo.h>
@@ -223,6 +230,7 @@ EAPI void efl_ui_focus_relation_free(Efl_Ui_Focus_Relations
*rel);
# include <efl_ui_progressbar_eo.h>
# include <efl_ui_radio_eo.h>
# include <efl_ui_panes_eo.h>
+# include <efl_ui_panes_part.eo.h>
/**
* Initialize Elementary
diff --git a/src/lib/elementary/Elementary.h b/src/lib/elementary/Elementary.h
index c37c41df0a..60bd21fa7f 100644
--- a/src/lib/elementary/Elementary.h
+++ b/src/lib/elementary/Elementary.h
@@ -148,7 +148,11 @@ EAPI extern Elm_Version *elm_version;
#include <elm_focus.h>
#if defined (EFL_EO_API_SUPPORT) && defined (EFL_BETA_API_SUPPORT)
-
+/* FIXME: wtf? */
+#ifndef EFL_UI_RADIO_EVENT_CHANGED
+# define EFL_UI_RADIO_EVENT_CHANGED EFL_UI_NSTATE_EVENT_CHANGED
+#endif
+# include <efl_ui.eot.h>
//define focus manager earlier since focus object and manager is circular
typedef Eo Efl_Ui_Focus_Manager;
#define _EFL_UI_FOCUS_MANAGER_EO_CLASS_TYPE
@@ -167,7 +171,6 @@ EAPI void efl_ui_focus_relation_free(Efl_Ui_Focus_Relations
*rel);
# include <efl_ui_focus_layer.eo.h>
# include <elm_interface_scrollable.h>
# include <elm_interface_scrollable.eo.h>
-# include <elm_spinner_eo.h>
#endif
#include <elm_tooltip.h>
--
