diff options
Diffstat (limited to 'src/lib/elementary/elm_priv.h')
-rw-r--r-- | src/lib/elementary/elm_priv.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/lib/elementary/elm_priv.h b/src/lib/elementary/elm_priv.h index fede13f..ca3ab06 100644 --- a/src/lib/elementary/elm_priv.h +++ b/src/lib/elementary/elm_priv.h | |||
@@ -23,6 +23,7 @@ | |||
23 | 23 | ||
24 | // Evas internal EO APIs | 24 | // Evas internal EO APIs |
25 | # include "Evas.h" | 25 | # include "Evas.h" |
26 | #define EFL_INTERNAL_UNSTABLE | ||
26 | # include "Evas_Internal.h" | 27 | # include "Evas_Internal.h" |
27 | # include "Emotion.h" | 28 | # include "Emotion.h" |
28 | 29 | ||
@@ -166,13 +167,6 @@ | |||
166 | # include "efl_ui_selection_manager.eo.h" | 167 | # include "efl_ui_selection_manager.eo.h" |
167 | # include "efl_datetime_manager.eo.h" | 168 | # include "efl_datetime_manager.eo.h" |
168 | 169 | ||
169 | //FIXME this needs to not use elm_general.h and go to Efl_Ui.h | ||
170 | # include <elm_general.h> | ||
171 | # include <efl_text_interactive.eo.h> | ||
172 | # include <efl_ui_text.eo.h> | ||
173 | # include <efl_ui_text_editable.eo.h> | ||
174 | # include <efl_ui_text_async.eo.h> | ||
175 | |||
176 | extern const char *_efl_model_property_itemw; | 170 | extern const char *_efl_model_property_itemw; |
177 | extern const char *_efl_model_property_itemh; | 171 | extern const char *_efl_model_property_itemh; |
178 | extern const char *_efl_model_property_selfw; | 172 | extern const char *_efl_model_property_selfw; |
@@ -328,6 +322,9 @@ extern const char *_elm_engines[]; | |||
328 | # define ELM_PRIV_SMART_CALLBACKS_DESC(name, signal, type) \ | 322 | # define ELM_PRIV_SMART_CALLBACKS_DESC(name, signal, type) \ |
329 | {name, type}, | 323 | {name, type}, |
330 | 324 | ||
325 | # define CLAMP(x, min, max) \ | ||
326 | (((x) > (max)) ? (max) : (((x) < (min)) ? (min) : (x))) | ||
327 | |||
331 | struct _Elm_Config_Flags | 328 | struct _Elm_Config_Flags |
332 | { | 329 | { |
333 | Eina_Bool engine : 1; | 330 | Eina_Bool engine : 1; |