jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=27c0d53f9b969bc641b3b321ce55b77230d62817
commit 27c0d53f9b969bc641b3b321ce55b77230d62817
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date: Tue Feb 6 21:23:45 2018 +0900
efl_ui: Disable includes that don't compile
Efl.Ui.Text:
The EO file contains a lot of references to legacy Elm types, which are
defined in elm_general. They should be checked and moved over to
efl_ui.eot if necessary.
Efl.Ui.Multibuttonentry:
This class was originally supposed to be based on a Model Item but as of
now the API is still uncertain, so MBE itself hasn't been worked on
more. Disable this from EO-only apps until its API is fixed.
Ref T6666
---
src/lib/elementary/Efl_Ui.h | 21 +++++++++++++++++++++
src/lib/elementary/efl_ui_text.eo | 1 +
2 files changed, 22 insertions(+)
diff --git a/src/lib/elementary/Efl_Ui.h b/src/lib/elementary/Efl_Ui.h
index d069abdcad..c53990effb 100644
--- a/src/lib/elementary/Efl_Ui.h
+++ b/src/lib/elementary/Efl_Ui.h
@@ -4,6 +4,14 @@
#include <Efl_Config.h>
#include <Elementary_Options.h>
+#ifndef EFL_EO_API_SUPPORT
+# define EFL_EO_API_SUPPORT
+#endif
+
+#ifndef EFL_BETA_API_SUPPORT
+# define EFL_BETA_API_SUPPORT
+#endif
+
/* Standard headers for standard system calls etc. */
#include <stdio.h>
#include <stdlib.h>
@@ -135,6 +143,7 @@ extern EAPI double _efl_startup_time;
// EO types. Defined for legacy-only builds as legacy uses typedef of EO types.
#include "efl_ui.eot.h"
+#include "efl_selection_types.eot.h"
//define focus manager earlier since focus object and manager is circular
typedef Eo Efl_Ui_Focus_Manager;
@@ -180,17 +189,29 @@ typedef Eo Efl_Ui_Focus_Manager;
# include <efl_ui_win.eo.h>
# include <efl_ui_win_inlined.eo.h>
# include <efl_ui_win_socket.eo.h>
+
+/* FIXME: Efl.Ui.Text must not use elm_general.h */
+# 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>
# include <efl_ui_text_editable.eo.h>
# include <efl_ui_text_async.eo.h>
+# endif
+
# include <efl_ui_clock.h>
# include <efl_ui_image_factory.eo.h>
# include <efl_ui_video.h>
# include <efl_ui_nstate.h>
# include <efl_ui_calendar.h>
# include <efl_ui_button_eo.h>
+
+/* FIXME: Multibuttonentry must not use elm_widget_item */
+# warning Efl.Ui.Multibutton is not available yet without Elementary.h
+# if 0
# include <efl_ui_multibuttonentry.h>
+# endif
+
# include <efl_ui_slider_eo.h>
# include <efl_ui_flip_eo.h>
# include <efl_ui_frame_eo.h>
diff --git a/src/lib/elementary/efl_ui_text.eo
b/src/lib/elementary/efl_ui_text.eo
index 4e65f5053c..047692b010 100644
--- a/src/lib/elementary/efl_ui_text.eo
+++ b/src/lib/elementary/efl_ui_text.eo
@@ -1,3 +1,4 @@
+/* FIXME - Text object must stop using elm_general! */
import elm_general;
class Efl.Ui.Text (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
--
