forked from enlightenment/efl
efl_ui: remove efl_ui_text headers from Efl_Ui.h for now
these require legacy types and headers, which should not be brought into this header Reviewed-by: Marcel Hollerbach <mail@marcel-hollerbach.de> Differential Revision: https://phab.enlightenment.org/D10235
This commit is contained in:
parent
525790b6b3
commit
96be3cd83d
|
@ -3,7 +3,7 @@
|
||||||
#endif
|
#endif
|
||||||
#include <Elementary.h>
|
#include <Elementary.h>
|
||||||
#include <Efl_Ui.h>
|
#include <Efl_Ui.h>
|
||||||
|
#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h
|
||||||
#ifndef EFL_BETA_API_SUPPORT
|
#ifndef EFL_BETA_API_SUPPORT
|
||||||
#define EFL_BETA_API_SUPPORT
|
#define EFL_BETA_API_SUPPORT
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
#define EO_BETA_API
|
#define EO_BETA_API
|
||||||
#include <Efl_Ui.h>
|
#include <Efl_Ui.h>
|
||||||
#include <Elementary.h>
|
#include <Elementary.h>
|
||||||
|
#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h
|
||||||
static void
|
static void
|
||||||
_apply_style(Eo *obj, size_t start_pos, size_t end_pos, const char *style)
|
_apply_style(Eo *obj, size_t start_pos, size_t end_pos, const char *style)
|
||||||
{
|
{
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
#include <Elementary.h>
|
#include <Elementary.h>
|
||||||
#include <Efl_Ui.h>
|
#include <Efl_Ui.h>
|
||||||
#include "elm_spinner_eo.h"
|
#include "elm_spinner_eo.h"
|
||||||
|
#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h
|
||||||
static const int default_font_size = 48;
|
static const int default_font_size = 48;
|
||||||
|
|
||||||
typedef struct _Filter_Image
|
typedef struct _Filter_Image
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
#endif
|
#endif
|
||||||
#include <Efl_Ui.h>
|
#include <Efl_Ui.h>
|
||||||
#include <Elementary.h>
|
#include <Elementary.h>
|
||||||
|
#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h
|
||||||
#define MAX_NUM_OF_CONTENT 17
|
#define MAX_NUM_OF_CONTENT 17
|
||||||
|
|
||||||
const Efl_Class *content_class[MAX_NUM_OF_CONTENT];
|
const Efl_Class *content_class[MAX_NUM_OF_CONTENT];
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
#endif
|
#endif
|
||||||
#include <Efl_Ui.h>
|
#include <Efl_Ui.h>
|
||||||
#include <Elementary.h>
|
#include <Elementary.h>
|
||||||
|
#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h
|
||||||
static const struct {
|
static const struct {
|
||||||
Evas_Image_Orient orient;
|
Evas_Image_Orient orient;
|
||||||
const char *name;
|
const char *name;
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
#endif
|
#endif
|
||||||
#include <Efl_Ui.h>
|
#include <Efl_Ui.h>
|
||||||
#include <Elementary.h>
|
#include <Elementary.h>
|
||||||
|
#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h
|
||||||
/* A simple test, just displaying clock in its default format */
|
/* A simple test, just displaying clock in its default format */
|
||||||
|
|
||||||
Evas_Object *dt1, *dt2, *dt3, *dt4;
|
Evas_Object *dt1, *dt2, *dt3, *dt4;
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
# include "elementary_config.h"
|
# include "elementary_config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include <Elementary.h>
|
||||||
#include <Efl_Ui.h>
|
#include <Efl_Ui.h>
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
#endif
|
#endif
|
||||||
#include <Efl_Ui.h>
|
#include <Efl_Ui.h>
|
||||||
#include <Elementary.h>
|
#include <Elementary.h>
|
||||||
|
#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h
|
||||||
static void
|
static void
|
||||||
_inc_clicked(void *data, const Efl_Event *ev EINA_UNUSED)
|
_inc_clicked(void *data, const Efl_Event *ev EINA_UNUSED)
|
||||||
{
|
{
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
#endif
|
#endif
|
||||||
#include <Elementary.h>
|
#include <Elementary.h>
|
||||||
#include <Efl_Ui.h>
|
#include <Efl_Ui.h>
|
||||||
|
#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h
|
||||||
static const struct {
|
static const struct {
|
||||||
Efl_Gfx_Image_Orientation orient;
|
Efl_Gfx_Image_Orientation orient;
|
||||||
const char *name;
|
const char *name;
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
# include "elementary_config.h"
|
# include "elementary_config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include <Elementary.h>
|
||||||
#include <Efl_Ui.h>
|
#include <Efl_Ui.h>
|
||||||
|
|
||||||
static Efl_Ui_Widget*
|
static Efl_Ui_Widget*
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
#include "test.h"
|
|
||||||
#ifdef HAVE_CONFIG_H
|
#ifdef HAVE_CONFIG_H
|
||||||
# include "elementary_config.h"
|
# include "elementary_config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <Efl_Ui.h>
|
#include <Efl_Ui.h>
|
||||||
#include <Elementary.h>
|
#include <Elementary.h>
|
||||||
|
#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h
|
||||||
|
#include "test.h"
|
||||||
static Eo *layout, *btn1, *btn2, *btn3;
|
static Eo *layout, *btn1, *btn2, *btn3;
|
||||||
|
|
||||||
typedef enum {
|
typedef enum {
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
#endif
|
#endif
|
||||||
#include <Efl_Ui.h>
|
#include <Efl_Ui.h>
|
||||||
#include <Elementary.h>
|
#include <Elementary.h>
|
||||||
|
#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h
|
||||||
static void
|
static void
|
||||||
_slider_changed_cb(void *data EINA_UNUSED, const Efl_Event *ev)
|
_slider_changed_cb(void *data EINA_UNUSED, const Efl_Event *ev)
|
||||||
{
|
{
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
#endif
|
#endif
|
||||||
#include <Efl_Ui.h>
|
#include <Efl_Ui.h>
|
||||||
#include <Elementary.h>
|
#include <Elementary.h>
|
||||||
|
#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h
|
||||||
static double
|
static double
|
||||||
_step_size_calculate(double min, double max)
|
_step_size_calculate(double min, double max)
|
||||||
{
|
{
|
||||||
|
|
|
@ -4,6 +4,8 @@
|
||||||
#include <Efl_Ui.h>
|
#include <Efl_Ui.h>
|
||||||
#include <Elementary.h>
|
#include <Elementary.h>
|
||||||
|
|
||||||
|
#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_bt_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
|
_bt_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
|
||||||
{
|
{
|
||||||
|
|
|
@ -13,6 +13,13 @@
|
||||||
#include <Eio.h>
|
#include <Eio.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
|
//FIXME this can go away when efl_ui_text doesn't need elm_general
|
||||||
|
# include <elm_general.h>
|
||||||
|
# include <efl_text_interactive.eo.h>
|
||||||
|
# include <efl_ui_text.eo.h>
|
||||||
|
# include <efl_ui_text_editable.eo.h>
|
||||||
|
# include <efl_ui_text_async.eo.h>
|
||||||
|
|
||||||
#define NUM_ITEMS 400
|
#define NUM_ITEMS 400
|
||||||
|
|
||||||
typedef struct _List_Scroll_Data {
|
typedef struct _List_Scroll_Data {
|
||||||
|
|
|
@ -245,12 +245,13 @@ EAPI Eina_Bool efl_ui_win_autodel_get(const Efl_Ui_Win *obj);
|
||||||
# include <efl_ui_win_socket.eo.h>
|
# include <efl_ui_win_socket.eo.h>
|
||||||
# include <efl_ui_relative_layout.eo.h>
|
# include <efl_ui_relative_layout.eo.h>
|
||||||
|
|
||||||
/* FIXME: Efl.Ui.Text must not use elm_general.h */
|
/* FIXME: Efl.Ui.Text must not use elm_general.h
|
||||||
# include <elm_general.h>
|
# include <elm_general.h>
|
||||||
# include <efl_text_interactive.eo.h>
|
# include <efl_text_interactive.eo.h>
|
||||||
# include <efl_ui_text.eo.h>
|
# include <efl_ui_text.eo.h>
|
||||||
# include <efl_ui_text_editable.eo.h>
|
# include <efl_ui_text_editable.eo.h>
|
||||||
# include <efl_ui_text_async.eo.h>
|
# include <efl_ui_text_async.eo.h>
|
||||||
|
*/
|
||||||
|
|
||||||
# include <efl_ui_animation_view.eo.h>
|
# include <efl_ui_animation_view.eo.h>
|
||||||
# include <efl_ui_clock.eo.h>
|
# include <efl_ui_clock.eo.h>
|
||||||
|
|
|
@ -166,6 +166,13 @@
|
||||||
# include "efl_ui_selection_manager.eo.h"
|
# include "efl_ui_selection_manager.eo.h"
|
||||||
# include "efl_datetime_manager.eo.h"
|
# include "efl_datetime_manager.eo.h"
|
||||||
|
|
||||||
|
//FIXME this needs to not use elm_general.h and go to Efl_Ui.h
|
||||||
|
# include <elm_general.h>
|
||||||
|
# include <efl_text_interactive.eo.h>
|
||||||
|
# include <efl_ui_text.eo.h>
|
||||||
|
# include <efl_ui_text_editable.eo.h>
|
||||||
|
# include <efl_ui_text_async.eo.h>
|
||||||
|
|
||||||
extern const char *_efl_model_property_itemw;
|
extern const char *_efl_model_property_itemw;
|
||||||
extern const char *_efl_model_property_itemh;
|
extern const char *_efl_model_property_itemh;
|
||||||
extern const char *_efl_model_property_selfw;
|
extern const char *_efl_model_property_selfw;
|
||||||
|
|
Loading…
Reference in New Issue