Enlightenment CVS committal
Author : ningerso
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_base.h ewl_colorpicker.c ewl_config.c ewl_container.c
ewl_container.h ewl_cursor.c ewl_embed.c ewl_embed.h
ewl_engines.c ewl_image.c ewl_image.h ewl_media.c ewl_media.h
ewl_menu.h ewl_misc.c ewl_misc.h ewl_overlay.h ewl_private.h
ewl_text.c ewl_text.h ewl_widget.c ewl_widget.h ewl_window.c
Log Message:
Use generic pointers to evas objects to avoid required inclusion of Evas.h in
external code.
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_base.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ewl_base.h 6 Feb 2007 13:42:16 -0000 1.1
+++ ewl_base.h 12 Feb 2007 13:16:04 -0000 1.2
@@ -6,7 +6,6 @@
#ifndef EWL_BASE_H
#define EWL_BASE_H
-#include <Evas.h>
#include <Ecore.h>
#include <Ecore_Data.h>
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_colorpicker.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- ewl_colorpicker.c 6 Feb 2007 13:42:16 -0000 1.35
+++ ewl_colorpicker.c 12 Feb 2007 13:16:05 -0000 1.36
@@ -935,5 +935,3 @@
DRETURN_INT(rb->mode, DLEVEL_STABLE);
}
-
-
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_config.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- ewl_config.c 6 Feb 2007 13:42:17 -0000 1.25
+++ ewl_config.c 12 Feb 2007 13:16:05 -0000 1.26
@@ -608,15 +608,15 @@
ecore_list_goto_first(ewl_embed_list);
while ((e = ecore_list_next(ewl_embed_list)) != NULL)
{
- if (!e->evas) continue;
+ if (!e->canvas) continue;
- evas_font_cache_flush(e->evas);
- evas_font_cache_set(e->evas,
+ evas_font_cache_flush(e->canvas);
+ evas_font_cache_set(e->canvas,
ewl_config_int_get(ewl_config,
EWL_CONFIG_CACHE_EVAS_FONT));
- evas_image_cache_flush(e->evas);
- evas_image_cache_set(e->evas,
+ evas_image_cache_flush(e->canvas);
+ evas_image_cache_set(e->canvas,
ewl_config_int_get(ewl_config,
EWL_CONFIG_CACHE_EVAS_IMAGE));
}
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_container.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -3 -r1.55 -r1.56
--- ewl_container.c 6 Feb 2007 13:42:17 -0000 1.55
+++ ewl_container.c 12 Feb 2007 13:16:05 -0000 1.56
@@ -1407,7 +1407,7 @@
* to the wanted area.
*/
if (!c->clip_box)
- c->clip_box = evas_object_rectangle_add(e->evas);
+ c->clip_box = evas_object_rectangle_add(e->canvas);
/*
* Setup the remaining properties for the clip box.
@@ -1526,7 +1526,7 @@
* Clean up the clip box of the container.
*/
if (c->clip_box) {
- ewl_evas_object_destroy(c->clip_box);
+ ewl_canvas_object_destroy(c->clip_box);
c->clip_box = NULL;
}
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_container.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- ewl_container.h 4 Jan 2007 05:09:46 -0000 1.28
+++ ewl_container.h 12 Feb 2007 13:16:05 -0000 1.29
@@ -85,7 +85,7 @@
Ecore_DList *children; /**< List of children that are contained. */
- Evas_Object *clip_box; /**< Clip box to bound widgets inside. */
+ void *clip_box; /**< Clip box to bound widgets inside. */
Ewl_Container *redirect; /**< Alternate parent for children */
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_cursor.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ewl_cursor.c 6 Feb 2007 13:42:17 -0000 1.6
+++ ewl_cursor.c 12 Feb 2007 13:16:05 -0000 1.7
@@ -91,7 +91,7 @@
ewl_engine_pointer_free(EWL_EMBED(parent), cursor->handle);
handle = ewl_engine_pointer_data_new(EWL_EMBED(parent),
- EWL_EMBED(cursor)->evas_window, width, height);
+ EWL_EMBED(cursor)->canvas_window, width, height);
if (EWL_EMBED(parent)->cursor == cursor->handle)
ewl_engine_pointer_set(EWL_EMBED(parent), handle);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_embed.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -3 -r1.110 -r1.111
--- ewl_embed.c 7 Feb 2007 04:03:27 -0000 1.110
+++ ewl_embed.c 12 Feb 2007 13:16:05 -0000 1.111
@@ -197,8 +197,8 @@
* The returned smart object can be used to manipulate the area used by EWL
* through standard evas functions.
*/
-Evas_Object *
-ewl_embed_evas_set(Ewl_Embed *emb, Evas *evas, Ewl_Embed_Window *evas_window)
+void *
+ewl_embed_canvas_set(Ewl_Embed *emb, void *canvas, Ewl_Embed_Window
*canvas_window)
{
Ewl_Widget *w;
Ecore_List *paths;
@@ -207,11 +207,11 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR_RET("emb", emb, NULL);
- DCHECK_PARAM_PTR_RET("evas", evas, NULL);
+ DCHECK_PARAM_PTR_RET("canvas", canvas, NULL);
DCHECK_TYPE_RET("emb", emb, EWL_EMBED_TYPE, NULL);
- emb->evas = evas;
- emb->evas_window = evas_window;
+ emb->canvas = canvas;
+ emb->canvas_window = canvas_window;
if (!embedded_smart) {
embedded_smart = evas_smart_new(name,
@@ -228,11 +228,11 @@
}
if (emb->smart) {
- ewl_evas_object_destroy(emb->smart);
+ ewl_canvas_object_destroy(emb->smart);
emb->smart = NULL;
}
- emb->smart = evas_object_smart_add(emb->evas, embedded_smart);
+ emb->smart = evas_object_smart_add(emb->canvas, embedded_smart);
evas_object_smart_data_set(emb->smart, emb);
w = EWL_WIDGET(emb);
@@ -243,7 +243,7 @@
paths = ewl_theme_font_path_get();
ecore_list_goto_first(paths);
while ((font_path = ecore_list_next(paths))) {
- evas_font_path_append(evas, font_path);
+ evas_font_path_append(canvas, font_path);
}
DRETURN_PTR(emb->smart, DLEVEL_STABLE);
@@ -1094,7 +1094,7 @@
ecore_list_goto_first(ewl_embed_list);
while ((e = ecore_list_next(ewl_embed_list)))
if (REALIZED(e))
- evas_font_path_append(e->evas, path);
+ evas_font_path_append(e->canvas, path);
ecore_list_append(ewl_theme_font_path_get(), strdup(path));
@@ -1107,7 +1107,7 @@
* @brief Find an ewl embed by its evas window
*/
Ewl_Embed *
-ewl_embed_evas_window_find(Ewl_Embed_Window *window)
+ewl_embed_canvas_window_find(Ewl_Embed_Window *window)
{
Ewl_Embed *retemb;
@@ -1117,7 +1117,7 @@
ecore_list_goto_first(ewl_embed_list);
while ((retemb = ecore_list_next(ewl_embed_list)) != NULL) {
- if (retemb->evas_window == window)
+ if (retemb->canvas_window == window)
DRETURN_PTR(retemb, DLEVEL_STABLE);
}
@@ -1152,7 +1152,7 @@
* @brief Caches the specified object for later reuse.
*/
void
-ewl_embed_object_cache(Ewl_Embed *e, Evas_Object *obj)
+ewl_embed_object_cache(Ewl_Embed *e, void *obj)
{
const char *type;
Ecore_List *obj_list;
@@ -1185,7 +1185,7 @@
ecore_list_prepend(obj_list, obj);
}
else
- ewl_evas_object_destroy(obj);
+ ewl_canvas_object_destroy(obj);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -1195,7 +1195,7 @@
* @param type: the type of object requested
* @return Returns an Evas_Object of the specified type on success.
*/
-Evas_Object *
+void *
ewl_embed_object_request(Ewl_Embed *e, char *type)
{
Evas_Object *obj = NULL;
@@ -1621,12 +1621,12 @@
DCHECK_PARAM_PTR("e", e);
DCHECK_TYPE("e", e, EWL_EMBED_TYPE);
- if (e->evas) {
+ if (e->canvas) {
if (x)
- *x = (int)(evas_coord_world_x_to_screen(e->evas,
+ *x = (int)(evas_coord_world_x_to_screen(e->canvas,
(Evas_Coord)(xx)));
if (y)
- *y = (int)(evas_coord_world_y_to_screen(e->evas,
+ *y = (int)(evas_coord_world_y_to_screen(e->canvas,
(Evas_Coord)(yy)));
}
@@ -1801,7 +1801,7 @@
*/
emb->ev_clip = ewl_embed_object_request(emb, "rectangle");
if (!emb->ev_clip)
- emb->ev_clip = evas_object_rectangle_add(emb->evas);
+ emb->ev_clip = evas_object_rectangle_add(emb->canvas);
evas_object_color_set(emb->ev_clip, 0, 0, 0, 0);
evas_object_smart_member_add(emb->ev_clip, emb->smart);
evas_object_show(emb->ev_clip);
@@ -1866,13 +1866,13 @@
emb = EWL_EMBED(w);
if (emb->ev_clip) {
- ewl_evas_object_destroy(emb->ev_clip);
+ ewl_canvas_object_destroy(emb->ev_clip);
emb->ev_clip = NULL;
}
if (emb->smart) {
evas_object_smart_data_set(emb->smart, NULL);
- ewl_evas_object_destroy(emb->smart);
+ ewl_canvas_object_destroy(emb->smart);
emb->smart = NULL;
}
@@ -2063,7 +2063,7 @@
*/
obj_list = ecore_hash_remove(emb->obj_cache, key);
while ((obj = ecore_list_remove_first(obj_list)))
- ewl_evas_object_destroy(obj);
+ ewl_canvas_object_destroy(obj);
ecore_list_destroy(obj_list);
}
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_embed.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- ewl_embed.h 7 Feb 2007 04:03:27 -0000 1.41
+++ ewl_embed.h 12 Feb 2007 13:16:05 -0000 1.42
@@ -3,9 +3,9 @@
#define EWL_EMBED_H
/**
- * @addtogroup Ewl_Embed Ewl_Embed: A Container for Displaying on an Evas
- * Defines the Ewl_Embed class to provide EWL with the ability to work with an
- * evas.
+ * @addtogroup Ewl_Embed Ewl_Embed: A Container for Displaying on an canvas
+ * Defines the Ewl_Embed class to provide EWL with the ability to work with a
+ * canvas.
*
* @remarks Inherits from Ewl_Overlay.
* @image html Ewl_Embed_inheritance.png
@@ -26,12 +26,12 @@
/**
* The embed structure is mostly a container for holding widgets and a
- * wrapper evas smart object.
+ * wrapper canvas smart object.
*/
typedef struct Ewl_Embed Ewl_Embed;
/**
-* Typedef and abstract out embedded evas windows
+* Typedef and abstract out embedded canvas windows
*/
typedef void *Ewl_Embed_Window;
@@ -43,13 +43,13 @@
/**
* @def EWL_EMBED_WINDOW(window)
-* @brief Typecast a pointer to an evas window
+* @brief Typecast a pointer to an canvas window
*/
#define EWL_EMBED_WINDOW(window) ((Ewl_Embed_Window *)window)
/**
* @brief The class inheriting from Ewl_Container that acts as a top level
- * widget for interacting with the evas.
+ * widget for interacting with the canvas.
*/
struct Ewl_Embed
{
@@ -58,12 +58,12 @@
const char *engine_name; /**< Name of current engine used */
void *engine; /**< The display engine */
- Evas *evas; /**< Evas where drawing takes place. */
- void *evas_window; /**< The window holding the evas. */
+ void *canvas; /**< Canvas where drawing takes place. */
+ void *canvas_window; /**< The window holding the canvas. */
int cursor; /**< Id for current cursor in use */
- Evas_Object *smart; /**< Manipulate Ewl_Embed from evas */
- Evas_Object *ev_clip; /**< Clip box to receive evas events */
+ void *smart; /**< Manipulate Ewl_Embed from canvas */
+ void *ev_clip; /**< Clip box to receive canvas events */
Ecore_DList *tab_order; /**< Order of widgets to send focus */
Ecore_Hash *obj_cache; /**< Hash of object queues for reuse */
@@ -92,8 +92,8 @@
int ewl_embed_engine_name_set(Ewl_Embed *embed, const char
*engine);
const char *ewl_embed_engine_name_get(Ewl_Embed *embed);
void ewl_embed_shutdown(void);
-Evas_Object *ewl_embed_evas_set(Ewl_Embed *emb, Evas *evas,
- Ewl_Embed_Window *evas_window);
+void *ewl_embed_canvas_set(Ewl_Embed *emb, void *canvas,
+ Ewl_Embed_Window *canvas_window);
void ewl_embed_focus_set(Ewl_Embed *embed, int f);
int ewl_embed_focus_get(Ewl_Embed *embed);
@@ -129,10 +129,10 @@
int z, int dir, unsigned int mods);
void ewl_embed_font_path_add(char *path);
-Ewl_Embed *ewl_embed_evas_window_find(Ewl_Embed_Window *win);
+Ewl_Embed *ewl_embed_canvas_window_find(Ewl_Embed_Window *win);
Ewl_Embed *ewl_embed_widget_find(Ewl_Widget *w);
-void ewl_embed_object_cache(Ewl_Embed *e, Evas_Object *obj);
-Evas_Object *ewl_embed_object_request(Ewl_Embed *e, char *type);
+void ewl_embed_object_cache(Ewl_Embed *e, void *obj);
+void *ewl_embed_object_request(Ewl_Embed *e, char *type);
void ewl_embed_tab_order_append(Ewl_Embed *e, Ewl_Widget *w);
void ewl_embed_tab_order_prepend(Ewl_Embed *e, Ewl_Widget *w);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_engines.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -3 -r1.37 -r1.38
--- ewl_engines.c 6 Feb 2007 13:42:17 -0000 1.37
+++ ewl_engines.c 12 Feb 2007 13:16:05 -0000 1.38
@@ -793,7 +793,7 @@
DCHECK_PARAM_PTR("embed", embed);
DCHECK_TYPE("embed", embed, EWL_EMBED_TYPE);
- if (!(embed->evas_window))
+ if (!(embed->canvas_window))
DRETURN(DLEVEL_STABLE);
embed_dnd_aware_set = ewl_engine_hook_get(EWL_EMBED(embed),
@@ -821,7 +821,7 @@
DCHECK_PARAM_PTR("embed", embed);
DCHECK_TYPE("embed", embed, EWL_EMBED_TYPE);
- if (!(embed->evas_window))
+ if (!(embed->canvas_window))
DRETURN(DLEVEL_STABLE);
embed_dnd_drag_types_set = ewl_engine_hook_get(EWL_EMBED(embed),
@@ -847,7 +847,7 @@
DCHECK_PARAM_PTR("embed", embed);
DCHECK_TYPE("embed", embed, EWL_EMBED_TYPE);
- if (!(embed->evas_window))
+ if (!(embed->canvas_window))
DRETURN(DLEVEL_STABLE);
embed_dnd_drag_start = ewl_engine_hook_get(EWL_EMBED(embed),
@@ -873,7 +873,7 @@
DCHECK_PARAM_PTR("embed", embed);
DCHECK_TYPE("embed", embed, EWL_EMBED_TYPE);
- if (!(embed->evas_window))
+ if (!(embed->canvas_window))
DRETURN(DLEVEL_STABLE);
embed_dnd_drag_drop = ewl_engine_hook_get(EWL_EMBED(embed),
@@ -903,7 +903,7 @@
DCHECK_PARAM_PTR_RET("embed", embed, FALSE);
DCHECK_TYPE_RET("embed", embed, EWL_EMBED_TYPE, FALSE);
- if (!(embed->evas_window))
+ if (!(embed->canvas_window))
DRETURN_INT(FALSE, DLEVEL_STABLE);
embed_dnd_drag_data_send = ewl_engine_hook_get(EWL_EMBED(embed),
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_image.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -3 -r1.54 -r1.55
--- ewl_image.c 6 Feb 2007 13:42:17 -0000 1.54
+++ ewl_image.c 12 Feb 2007 13:16:05 -0000 1.55
@@ -750,7 +750,7 @@
if (!i->image)
i->image = ewl_embed_object_request(emb, "edje");
if (!i->image)
- i->image = edje_object_add(emb->evas);
+ i->image = edje_object_add(emb->canvas);
if (!i->image)
DRETURN(DLEVEL_STABLE);
@@ -761,7 +761,7 @@
if (!i->image)
i->image = ewl_embed_object_request(emb,
EWL_IMAGE_TYPE);
if (!i->image)
- i->image = evas_object_image_add(emb->evas);
+ i->image = evas_object_image_add(emb->canvas);
if (!i->image)
DRETURN(DLEVEL_STABLE);
@@ -1036,7 +1036,7 @@
ev = ev_data;
if (i->type == EWL_IMAGE_TYPE_EDJE)
- evas_event_feed_mouse_down(emb->evas, ev->button,
+ evas_event_feed_mouse_down(emb->canvas, ev->button,
EVAS_BUTTON_NONE,
(unsigned int)((unsigned long
long)(ecore_time_get() * 1000.0) & 0xffffffff),
NULL);
@@ -1069,7 +1069,7 @@
ev = ev_data;
if (i->type == EWL_IMAGE_TYPE_EDJE && emb)
- evas_event_feed_mouse_up(emb->evas, ev->button,
+ evas_event_feed_mouse_up(emb->canvas, ev->button,
EVAS_BUTTON_NONE,
(unsigned int)((unsigned long
long)(ecore_time_get() * 1000.0) & 0xffffffff),
NULL);
@@ -1102,7 +1102,7 @@
ev = ev_data;
if (i->type == EWL_IMAGE_TYPE_EDJE)
- evas_event_feed_mouse_move(emb->evas, ev->x, ev->y,
+ evas_event_feed_mouse_move(emb->canvas, ev->x, ev->y,
(unsigned int)((unsigned long
long)(ecore_time_get() * 1000.0) & 0xffffffff),
NULL);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_image.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- ewl_image.h 4 Jan 2007 05:09:47 -0000 1.31
+++ ewl_image.h 12 Feb 2007 13:16:05 -0000 1.32
@@ -56,7 +56,7 @@
{
Ewl_Widget widget; /**< Inherit from Ewl_Widget */
Ewl_Image_Type type; /**< The type of the image */
- Evas_Object *image; /**< The evas object for the image */
+ void *image; /**< The evas object for the image */
char *path; /**< The path to the image */
char *key; /**< The key for the image */
char proportional; /**< Is the image displayed proportional */
@@ -65,8 +65,8 @@
double sw, /**< Scale width */
sh; /**< Scale height */
int cs; /**< Constrain size */
- Evas_Coord aw, /**< Scale width */
- ah; /**< Scale height */
+ int aw, /**< Scale width */
+ ah; /**< Scale height */
struct {
int set; /**< Tiling set? */
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_media.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- ewl_media.c 6 Feb 2007 13:42:17 -0000 1.25
+++ ewl_media.c 12 Feb 2007 13:16:05 -0000 1.26
@@ -486,7 +486,7 @@
m = EWL_MEDIA(w);
/*
- * Find the embed so we know which evas to draw onto.
+ * Find the embed so we know which canvas to draw onto.
*/
emb = ewl_embed_widget_find(w);
@@ -494,7 +494,7 @@
/*
* Create the emotion
*/
- m->video = emotion_object_add(emb->evas);
+ m->video = emotion_object_add(emb->canvas);
if (ewl_media_module_set(m, m->module) && m->media) {
emotion_object_file_set(m->video, m->media);
ewl_media_size_update(m);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_media.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- ewl_media.h 4 Jan 2007 05:09:47 -0000 1.18
+++ ewl_media.h 12 Feb 2007 13:16:05 -0000 1.19
@@ -41,7 +41,7 @@
struct Ewl_Media
{
Ewl_Widget widget; /**< Inherit from Ewl_Widget */
- Evas_Object *video; /**< Emotion does the actual work */
+ void *video; /**< Emotion does the actual work */
Ewl_Media_Module_Type module; /**< Path to the module file */
char *media; /**< Path to the media file */
int block_seek; /**< Temporarily prevent seeking */
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_menu.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- ewl_menu.h 6 Feb 2007 22:35:21 -0000 1.22
+++ ewl_menu.h 12 Feb 2007 13:16:05 -0000 1.23
@@ -7,7 +7,7 @@
/**
* @addtogroup Ewl_Menu Ewl_Menu: A Simple Windowed Menu
* Defines a menu used globally. The contents on the menu are drawn outside of
- * the Evas.
+ * the canvas.
*
* @remarks Inherits from Ewl_Menu_Base.
* @image html Ewl_Menu_inheritance.png
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_misc.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -3 -r1.82 -r1.83
--- ewl_misc.c 9 Feb 2007 22:34:35 -0000 1.82
+++ ewl_misc.c 12 Feb 2007 13:16:05 -0000 1.83
@@ -980,7 +980,7 @@
* @brief Queues an evas to be destroyed at a later time.
*/
void
-ewl_evas_destroy(Evas *evas)
+ewl_canvas_destroy(void *evas)
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("evas", evas);
@@ -997,7 +997,7 @@
* @brief Queues an evas object to be destroyed at a later time.
*/
void
-ewl_evas_object_destroy(Evas_Object *obj)
+ewl_canvas_object_destroy(void *obj)
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("obj", obj);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_misc.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- ewl_misc.h 6 Jan 2007 13:14:13 -0000 1.23
+++ ewl_misc.h 12 Feb 2007 13:16:05 -0000 1.24
@@ -19,8 +19,8 @@
void ewl_realize_request(Ewl_Widget *w);
void ewl_realize_cancel_request(Ewl_Widget *w);
void ewl_destroy_request(Ewl_Widget *w);
-void ewl_evas_destroy(Evas *evas);
-void ewl_evas_object_destroy(Evas_Object *obj);
+void ewl_canvas_destroy(void *evas);
+void ewl_canvas_object_destroy(void *obj);
void ewl_debug_indent_print(int mod_dir);
/*
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_overlay.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- ewl_overlay.h 4 Jan 2007 05:09:47 -0000 1.11
+++ ewl_overlay.h 12 Feb 2007 13:16:05 -0000 1.12
@@ -3,7 +3,7 @@
#define EWL_OVERLAY_H
/**
- * @addtogroup Ewl_Overlay Ewl_Overlay: A Container for Displaying on an Evas
+ * @addtogroup Ewl_Overlay Ewl_Overlay: A Container for Displaying on a canvas
* Defines the Ewl_Overlay class to provide EWL with the ability to work with
an
* evas.
*
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_private.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- ewl_private.h 10 Jan 2007 11:34:25 -0000 1.16
+++ ewl_private.h 12 Feb 2007 13:16:05 -0000 1.17
@@ -2,6 +2,7 @@
#ifndef _EWL_PRIVATE_H
#define _EWL_PRIVATE_H
+#include <Evas.h>
#include <Edje.h>
#include <Ecore_Str.h>
#include <Ecore_File.h>
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_text.c,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -3 -r1.156 -r1.157
--- ewl_text.c 6 Feb 2007 13:42:17 -0000 1.156
+++ ewl_text.c 12 Feb 2007 13:16:05 -0000 1.157
@@ -3616,7 +3616,7 @@
/* create the textblock */
t->textblock = ewl_embed_object_request(emb, "textblock");
if (!t->textblock)
- t->textblock = evas_object_textblock_add(emb->evas);
+ t->textblock = evas_object_textblock_add(emb->canvas);
if (t->textblock)
{
@@ -5182,7 +5182,7 @@
Ewl_Window *win;
emb = ewl_embed_widget_find(EWL_WIDGET(s->text_parent));
- win = ewl_window_window_find(emb->evas_window);
+ win = ewl_window_window_find(emb->canvas_window);
ewl_window_selection_text_set(win, txt);
FREE(txt);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_text.h,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -3 -r1.51 -r1.52
--- ewl_text.h 4 Jan 2007 05:09:48 -0000 1.51
+++ ewl_text.h 12 Feb 2007 13:16:05 -0000 1.52
@@ -70,7 +70,7 @@
struct Ewl_Text
{
Ewl_Container container; /**< Inherit from Ewl_Container */
- Evas_Object *textblock; /**< The Evas_Object_Textblock */
+ void *textblock; /**< The Evas_Object_Textblock */
char *text; /**< The text itself */
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_widget.c,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -3 -r1.125 -r1.126
--- ewl_widget.c 6 Feb 2007 21:15:21 -0000 1.125
+++ ewl_widget.c 12 Feb 2007 13:16:05 -0000 1.126
@@ -295,7 +295,7 @@
ewl_object_visible_remove(EWL_OBJECT(w), EWL_FLAG_VISIBLE_OBSCURED);
emb = ewl_embed_widget_find(w);
- if (emb && emb->evas)
+ if (emb && emb->canvas)
ewl_callback_call(w, EWL_CALLBACK_REVEAL);
ewl_widget_configure(w);
@@ -1860,15 +1860,15 @@
Ewl_Embed *emb;
emb = ewl_embed_widget_find(w);
- if (!emb || !emb->evas)
+ if (!emb || !emb->canvas)
DRETURN(DLEVEL_STABLE);
- w->fx_clip_box = evas_object_rectangle_add(emb->evas);
+ w->fx_clip_box = evas_object_rectangle_add(emb->canvas);
evas_object_pass_events_set(w->fx_clip_box, TRUE);
ewl_widget_configure(w);
}
else {
- ewl_evas_object_destroy(w->fx_clip_box);
+ ewl_canvas_object_destroy(w->fx_clip_box);
w->fx_clip_box = NULL;
}
@@ -2336,7 +2336,7 @@
DCHECK_PARAM_PTR("w", w);
emb = ewl_embed_widget_find(w);
- if (!emb || !emb->evas)
+ if (!emb || !emb->canvas)
DRETURN(DLEVEL_STABLE);
/*
@@ -2363,7 +2363,7 @@
NULL, NULL, NULL, NULL,
NULL, NULL, NULL);
}
- w->smart_object = evas_object_smart_add(emb->evas,
+ w->smart_object = evas_object_smart_add(emb->canvas,
widget_smart);
}
evas_object_data_set(w->smart_object, "EWL", w);
@@ -2379,7 +2379,7 @@
*/
w->theme_object = ewl_embed_object_request(emb, "edje");
if (!w->theme_object)
- w->theme_object = edje_object_add(emb->evas);
+ w->theme_object = edje_object_add(emb->canvas);
/*
* Attempt to load the theme object
@@ -2443,7 +2443,7 @@
EWL_FLAG_VISIBLE_NOCLIP)) {
w->fx_clip_box = ewl_embed_object_request(emb, "rectangle");
if (!w->fx_clip_box) {
- w->fx_clip_box = evas_object_rectangle_add(emb->evas);
+ w->fx_clip_box = evas_object_rectangle_add(emb->canvas);
}
evas_object_pass_events_set(w->fx_clip_box, TRUE);
}
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_widget.h,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -3 -r1.55 -r1.56
--- ewl_widget.h 10 Jan 2007 11:34:25 -0000 1.55
+++ ewl_widget.h 12 Feb 2007 13:16:05 -0000 1.56
@@ -135,10 +135,10 @@
/**< Callback chain array */
Ewl_Attach_List *attach; /**< List of attachments on the widget */
- Evas_Object *smart_object; /**< Smart Object for the layer stuff */
- Evas_Object *fx_clip_box; /**< Clipping rectangle of widget */
+ void *smart_object; /**< Smart Object for the layer stuff */
+ void *fx_clip_box; /**< Clipping rectangle of widget */
- Evas_Object *theme_object; /**< Appearance shown on canvas */
+ void *theme_object; /**< Appearance shown on canvas */
const char *theme_path; /**< Path to the file for loading */
const char *theme_group; /**< Group in theme to use */
const char *theme_state; /**< State of the appearance */
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_window.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -3 -r1.72 -r1.73
--- ewl_window.c 7 Feb 2007 23:29:23 -0000 1.72
+++ ewl_window.c 12 Feb 2007 13:16:05 -0000 1.73
@@ -792,8 +792,8 @@
win = EWL_WINDOW(w);
ewl_embed_cache_cleanup(embed);
- ewl_evas_destroy(embed->evas);
- embed->evas = NULL;
+ ewl_canvas_destroy(embed->canvas);
+ embed->canvas = NULL;
if (REALIZED(w))
{
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier.
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
