summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2018-02-06 21:23:45 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2018-02-06 21:27:37 +0900
commit27c0d53f9b969bc641b3b321ce55b77230d62817 (patch)
tree0a0fe92c4a57e734c4768fe64b73791a71cd58ea
parent24b0ae0df5c6dc3f8de2f8a3144132d57deeef32 (diff)
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
-rw-r--r--src/lib/elementary/Efl_Ui.h21
-rw-r--r--src/lib/elementary/efl_ui_text.eo1
2 files changed, 22 insertions, 0 deletions
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 @@
4#include <Efl_Config.h> 4#include <Efl_Config.h>
5#include <Elementary_Options.h> 5#include <Elementary_Options.h>
6 6
7#ifndef EFL_EO_API_SUPPORT
8# define EFL_EO_API_SUPPORT
9#endif
10
11#ifndef EFL_BETA_API_SUPPORT
12# define EFL_BETA_API_SUPPORT
13#endif
14
7/* Standard headers for standard system calls etc. */ 15/* Standard headers for standard system calls etc. */
8#include <stdio.h> 16#include <stdio.h>
9#include <stdlib.h> 17#include <stdlib.h>
@@ -135,6 +143,7 @@ extern EAPI double _efl_startup_time;
135 143
136// EO types. Defined for legacy-only builds as legacy uses typedef of EO types. 144// EO types. Defined for legacy-only builds as legacy uses typedef of EO types.
137#include "efl_ui.eot.h" 145#include "efl_ui.eot.h"
146#include "efl_selection_types.eot.h"
138 147
139//define focus manager earlier since focus object and manager is circular 148//define focus manager earlier since focus object and manager is circular
140typedef Eo Efl_Ui_Focus_Manager; 149typedef Eo Efl_Ui_Focus_Manager;
@@ -180,17 +189,29 @@ typedef Eo Efl_Ui_Focus_Manager;
180# include <efl_ui_win.eo.h> 189# include <efl_ui_win.eo.h>
181# include <efl_ui_win_inlined.eo.h> 190# include <efl_ui_win_inlined.eo.h>
182# include <efl_ui_win_socket.eo.h> 191# include <efl_ui_win_socket.eo.h>
192
193/* FIXME: Efl.Ui.Text must not use elm_general.h */
194# warning Efl.Ui.Text is not available yet without Elementary.h
195# if 0
183# include <efl_ui_text_interactive.eo.h> 196# include <efl_ui_text_interactive.eo.h>
184# include <efl_ui_text.eo.h> 197# include <efl_ui_text.eo.h>
185# include <efl_ui_text_editable.eo.h> 198# include <efl_ui_text_editable.eo.h>
186# include <efl_ui_text_async.eo.h> 199# include <efl_ui_text_async.eo.h>
200# endif
201
187# include <efl_ui_clock.h> 202# include <efl_ui_clock.h>
188# include <efl_ui_image_factory.eo.h> 203# include <efl_ui_image_factory.eo.h>
189# include <efl_ui_video.h> 204# include <efl_ui_video.h>
190# include <efl_ui_nstate.h> 205# include <efl_ui_nstate.h>
191# include <efl_ui_calendar.h> 206# include <efl_ui_calendar.h>
192# include <efl_ui_button_eo.h> 207# include <efl_ui_button_eo.h>
208
209/* FIXME: Multibuttonentry must not use elm_widget_item */
210# warning Efl.Ui.Multibutton is not available yet without Elementary.h
211# if 0
193# include <efl_ui_multibuttonentry.h> 212# include <efl_ui_multibuttonentry.h>
213# endif
214
194# include <efl_ui_slider_eo.h> 215# include <efl_ui_slider_eo.h>
195# include <efl_ui_flip_eo.h> 216# include <efl_ui_flip_eo.h>
196# include <efl_ui_frame_eo.h> 217# 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 @@
1/* FIXME - Text object must stop using elm_general! */
1import elm_general; 2import elm_general;
2 3
3class Efl.Ui.Text (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable, 4class Efl.Ui.Text (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,