#endif
#include <Elementary.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
#define EFL_BETA_API_SUPPORT
#endif
#define EO_BETA_API
#include <Efl_Ui.h>
#include <Elementary.h>
-#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h
static void
_apply_style(Eo *obj, size_t start_pos, size_t end_pos, const char *style)
#include <Elementary.h>
#include <Efl_Ui.h>
#include "elm_spinner_eo.h"
-#include "elm_priv.h" //FIXME remove this once efl.ui.textbox doesn't need elm_general.h
+
static const int default_font_size = 48;
typedef struct _Filter_Image
#endif
#include <Efl_Ui.h>
#include <Elementary.h>
-#include "elm_priv.h" //FIXME remove this once efl.ui.textbox doesn't need elm_general.h
+
#define MAX_NUM_OF_CONTENT 17
const Efl_Class *content_class[MAX_NUM_OF_CONTENT];
#endif
#include <Efl_Ui.h>
#include <Elementary.h>
-#include "elm_priv.h" //FIXME remove this once efl.ui.textbox doesn't need elm_general.h
+
static const struct {
Evas_Image_Orient orient;
const char *name;
#endif
#include <Efl_Ui.h>
#include <Elementary.h>
-#include "elm_priv.h" //FIXME remove this once efl.ui.textbox doesn't need elm_general.h
+
/* A simple test, just displaying clock in its default format */
Evas_Object *dt1, *dt2, *dt3, *dt4;
# include "elementary_config.h"
#endif
-#include <Elementary.h>
#include <Efl_Ui.h>
static void
snprintf(buf, sizeof(buf), "%d - Test %d", i, i%13);
efl_text_set(il, buf);
- rect = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas_object_evas_get(c));
+ rect = efl_add(EFL_CANVAS_RECTANGLE_CLASS, c);
switch (i % 5)
{
case 0:
}
void test_efl_ui_collection_grid(void *data EINA_UNUSED,
- Evas_Object *obj EINA_UNUSED,
+ Efl_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
{
create_item_container_ui(EFL_UI_GRID_CLASS, EFL_UI_GRID_DEFAULT_ITEM_CLASS, "Efl.Ui.Grid");
}
void test_efl_ui_collection_list(void *data EINA_UNUSED,
- Evas_Object *obj EINA_UNUSED,
+ Efl_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
{
create_item_container_ui(EFL_UI_LIST_CLASS, EFL_UI_LIST_DEFAULT_ITEM_CLASS, "Efl.Ui.List");
#endif
#include <Efl_Ui.h>
#include <Elementary.h>
-#include "elm_priv.h" //FIXME remove this once efl.ui.textbox doesn't need elm_general.h
+
static void
_inc_clicked(void *data, const Efl_Event *ev EINA_UNUSED)
{
#endif
#include <Elementary.h>
#include <Efl_Ui.h>
-#include "elm_priv.h" //FIXME remove this once efl.ui.textbox doesn't need elm_general.h
+
static const struct {
Efl_Gfx_Image_Orientation orient;
const char *name;
# include "elementary_config.h"
#endif
-#include <Elementary.h>
#include <Efl_Ui.h>
static Efl_Ui_Widget*
snprintf(buf, sizeof(buf), "%d - Test %d", i, i%13);
efl_text_set(il, buf);
- rect = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas_object_evas_get(il));
+ rect = efl_add(EFL_CANVAS_RECTANGLE_CLASS, il);
switch (i % 5)
{
case 0:
}
void test_efl_ui_item(void *data EINA_UNUSED,
- Evas_Object *obj EINA_UNUSED,
+ Efl_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
{
Eo *win, *box, *o;
#include <Efl_Ui.h>
#include <Elementary.h>
-#include "elm_priv.h" //FIXME remove this once efl.ui.textbox doesn't need elm_general.h
#include "test.h"
+
static Eo *layout, *btn1, *btn2, *btn3;
typedef enum {
#endif
#include <Efl_Ui.h>
#include <Elementary.h>
-#include "elm_priv.h" //FIXME remove this once efl.ui.textbox doesn't need elm_general.h
+
static void
_slider_changed_cb(void *data EINA_UNUSED, const Efl_Event *ev)
{
#endif
#include <Efl_Ui.h>
#include <Elementary.h>
-#include "elm_priv.h" //FIXME remove this once efl.ui.textbox doesn't need elm_general.h
+
static double
_step_size_calculate(double min, double max)
{
#include <Efl_Ui.h>
#include <Elementary.h>
-#include "elm_priv.h" //FIXME remove this once efl.ui.textbox doesn't need elm_general.h
-
static void
_bt_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
#include <Eio.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_textbox.eo.h>
-# include <efl_ui_textbox_async.eo.h>
-
#define NUM_ITEMS 400
typedef struct _List_Scroll_Data {
# include "efl_ui_selection_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_textbox.eo.h>
-# include <efl_ui_textbox_async.eo.h>
-
extern const char *_efl_model_property_itemw;
extern const char *_efl_model_property_itemh;
extern const char *_efl_model_property_selfw;