Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/etox
Dir : e17/libs/etox/src
Modified Files:
Etox.h Etox_private.h etox.c etox_line.c etox_line.h
etox_obstacle.c etox_selection.c
Log Message:
Update etox to the new estyle api.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/etox/src/Etox.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -3 -r1.36 -r1.37
--- Etox.h 1 Aug 2003 21:12:13 -0000 1.36
+++ Etox.h 5 Aug 2003 18:45:36 -0000 1.37
@@ -211,7 +211,7 @@
struct _etox_obstacle
{
Etox *et;
- Estyle *bit;
+ Evas_Object *bit;
int start_line;
int end_line;
};
@@ -229,7 +229,7 @@
struct
{
Etox_Line *line;
- Estyle *bit;
+ Evas_Object *bit;
} start, end;
Etox_Context *context;
@@ -317,12 +317,11 @@
/*
* Geometry retrieval functions
*/
-void etox_get_geometry(Etox * et, int *x, int *y, int *w, int *h);
-int etox_coord_to_index(Etox * et, int x, int y);
-void etox_index_to_geometry(Etox * et, int index, int *x, int *y,
- int *w, int *h);
-int etox_coord_to_geometry(Etox * et, int xc, int yc, int *x, int *y,
- int *w, int *h);
+int etox_coord_to_index(Etox * et, double x, double y);
+void etox_index_to_geometry(Etox * et, int index, double *x, double *y,
+ double *w, double *h);
+int etox_coord_to_geometry(Etox * et, double xc, double yc, double *x,
+ double *y, double *w, double *h);
/*
* Appearance altering functions
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/etox/src/Etox_private.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- Etox_private.h 1 Aug 2003 21:12:13 -0000 1.17
+++ Etox_private.h 5 Aug 2003 18:45:36 -0000 1.18
@@ -33,7 +33,7 @@
};
void etox_layout(Etox * et);
-Estyle * etox_split_bit(Etox_Line *line, Estyle *bit, int index);
+Evas_Object * etox_split_bit(Etox_Line *line, Evas_Object *bit, int index);
Etox_Line * etox_coord_to_line(Etox *et, int y);
Etox_Line * etox_index_to_line(Etox *et, int *i);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/etox/src/etox.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -3 -r1.52 -r1.53
--- etox.c 1 Aug 2003 21:29:18 -0000 1.52
+++ etox.c 5 Aug 2003 18:45:36 -0000 1.53
@@ -304,7 +304,7 @@
*/
void etox_insert_text(Etox * et, char *text, int index)
{
- Estyle *bit;
+ Evas_Object *bit;
Evas_List *lines, *ll;
Etox_Line *start, *end, *temp;
@@ -495,7 +495,7 @@
*/
void etox_set_layer(Etox * et, int layer)
{
- Estyle *bit;
+ Evas_Object *bit;
Etox_Line *line;
Evas_List *l, *ll;
@@ -519,7 +519,7 @@
*/
for (ll = line->bits; ll; ll = ll->next) {
bit = ll->data;
- estyle_set_layer(bit, layer);
+ evas_object_layer_set(bit, layer);
}
}
}
@@ -651,11 +651,11 @@
* Returns no value. Stores the current geometry of the letter at index @index
* in @et into the integers pointed to by @x, @y, @w, and @h.
*/
-void etox_index_to_geometry(Etox * et, int index, int *x, int *y,
- int *w, int *h)
+void etox_index_to_geometry(Etox * et, int index, double *x, double *y,
+ double *w, double *h)
{
int sum;
- Estyle *bit = NULL;
+ Evas_Object *bit = NULL;
Etox_Line *line = NULL;
Evas_List *l, *ll, *lll;
@@ -723,13 +723,13 @@
* of the letter at coordinates @xc, @yc in @et into the integers pointed to by
* @x, @y, @w, and @h.
*/
-int etox_coord_to_geometry(Etox * et, int xc, int yc, int *x, int *y,
- int *w, int *h)
+int etox_coord_to_geometry(Etox * et, double xc, double yc, double *x,
+ double *y, double *w, double *h)
{
int sum;
- Estyle *bit;
+ Evas_Object *bit;
Etox_Line *line = NULL;
- int tx, ty, tw, th;
+ double tx, ty, tw, th;
Evas_List *l;
CHECK_PARAM_POINTER_RETURN("et", et, 0);
@@ -764,7 +764,7 @@
* happen with centered or right alignment.
*/
bit = line->bits->data;
- estyle_geometry(bit, &tx, &ty, &tw, &th);
+ evas_object_geometry_get(bit, &tx, &ty, &tw, &th);
if (xc < tx)
xc = tx;
@@ -775,7 +775,7 @@
*/
for (l = line->bits; l; l = l->next) {
bit = l->data;
- estyle_geometry(bit, &tx, &ty, &tw, &th);
+ evas_object_geometry_get(bit, &tx, &ty, &tw, &th);
if (xc >= tx && xc <= tx + tw)
break;
sum += estyle_length(bit);
@@ -798,7 +798,7 @@
* Now position it based on the total width of the line, and
* the starting position of the bits.
*/
- estyle_geometry(bit, &tx, &ty, &tw, &th);
+ evas_object_geometry_get(bit, &tx, &ty, &tw, &th);
*x = tx + line->w;
*y = line->y;
} else {
@@ -889,7 +889,7 @@
{
CHECK_PARAM_POINTER("obst", obst);
- estyle_move(obst->bit, x, y);
+ evas_object_move(obst->bit, x, y);
etox_obstacle_unplace(obst);
etox_obstacle_place(obst);
}
@@ -924,7 +924,7 @@
static Evas_List *_etox_break_text(Etox * et, char *text)
{
Evas_List *ret = NULL;
- Estyle *bit;
+ Evas_Object *bit;
Etox_Line *line = NULL;
char *walk = text;
char t = '\0';
@@ -957,13 +957,13 @@
*/
bit =
estyle_new(et->evas, text, et->context->style);
- estyle_set_clip(bit, et->clip);
- estyle_set_color(bit, et->context->r,
+ evas_object_clip_set(bit, et->clip);
+ evas_object_color_set(bit, et->context->r,
et->context->g, et->context->b,
et->context->a);
estyle_set_font(bit, et->context->font,
et->context->font_size);
etox_line_append(line, bit);
- estyle_show(bit);
+ evas_object_show(bit);
*walk = '\t';
text = walk + 1;
@@ -975,13 +975,13 @@
*text = '\0';
bit =
estyle_new(et->evas, walk, et->context->style);
- estyle_set_color(bit, et->context->r,
+ evas_object_color_set(bit, et->context->r,
et->context->g, et->context->b,
et->context->a);
- estyle_set_clip(bit, et->clip);
+ evas_object_clip_set(bit, et->clip);
estyle_set_font(bit, et->context->font,
et->context->font_size);
etox_line_append(line, bit);
- estyle_show(bit);
+ evas_object_show(bit);
*text = t;
break;
@@ -999,13 +999,14 @@
*/
bit =
estyle_new(et->evas, text, et->context->style);
- estyle_set_color(bit, et->context->r,
+ evas_object_color_set(bit, et->context->r,
et->context->g, et->context->b,
et->context->a);
- estyle_set_clip(bit, et->clip);
- estyle_set_font(bit, et->context->font,
et->context->font_size);
+ evas_object_clip_set(bit, et->clip);
+ estyle_set_font(bit, et->context->font,
+ et->context->font_size);
etox_line_append(line, bit);
- estyle_show(bit);
+ evas_object_show(bit);
*walk = '\n';
text = walk + 1;
@@ -1029,12 +1030,12 @@
*/
if (*text) {
bit = estyle_new(et->evas, text, et->context->style);
- estyle_set_color(bit, et->context->r, et->context->g,
+ evas_object_color_set(bit, et->context->r, et->context->g,
et->context->b, et->context->a);
- estyle_set_clip(bit, et->clip);
+ evas_object_clip_set(bit, et->clip);
estyle_set_font(bit, et->context->font, et->context->font_size);
etox_line_append(line, bit);
- estyle_show(bit);
+ evas_object_show(bit);
} else if (line->bits == NULL) {
ret = evas_list_remove(ret, line);
etox_line_free(line);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/etox/src/etox_line.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- etox_line.c 3 Aug 2003 05:05:04 -0000 1.18
+++ etox_line.c 5 Aug 2003 18:45:36 -0000 1.19
@@ -31,7 +31,7 @@
*/
void etox_line_free(Etox_Line * line)
{
- Estyle *bit;
+ Evas_Object *bit;
CHECK_PARAM_POINTER("line", line);
@@ -40,7 +40,7 @@
*/
while (line->bits) {
bit = line->bits->data;
- estyle_free(bit);
+ evas_object_del(bit);
line->bits = evas_list_remove(line->bits, bit);
}
@@ -55,7 +55,7 @@
*/
void etox_line_show(Etox_Line * line)
{
- Estyle *bit;
+ Evas_Object *bit;
Evas_List *l;
CHECK_PARAM_POINTER("line", line);
@@ -65,7 +65,7 @@
*/
for (l = line->bits; l; l = l->next) {
bit = l->data;
- estyle_show(bit);
+ evas_object_show(bit);
}
}
@@ -78,7 +78,7 @@
*/
void etox_line_hide(Etox_Line * line)
{
- Estyle *bit;
+ Evas_Object *bit;
Evas_List *l;
CHECK_PARAM_POINTER("line", line);
@@ -88,7 +88,7 @@
*/
for (l = line->bits; l; l = l->next) {
bit = l->data;
- estyle_hide(bit);
+ evas_object_hide(bit);
}
}
@@ -101,9 +101,9 @@
* Returns no value. Appends the bit @bit to the line @line and updates
* display to reflect the change.
*/
-void etox_line_append(Etox_Line * line, Estyle * bit)
+void etox_line_append(Etox_Line * line, Evas_Object * bit)
{
- int x, y, w, h;
+ double x, y, w, h;
CHECK_PARAM_POINTER("line", line);
CHECK_PARAM_POINTER("bit", bit);
@@ -112,7 +112,7 @@
* Append the text and update necessary fields
*/
line->bits = evas_list_append(line->bits, bit);
- estyle_geometry(bit, &x, &y, &w, &h);
+ evas_object_geometry_get(bit, &x, &y, &w, &h);
line->w += w;
if (h > line->h)
@@ -128,9 +128,9 @@
* Returns no value. Prepends the bit @bit to the line @line and updates
* display to reflect the change.
*/
-void etox_line_prepend(Etox_Line * line, Estyle * bit)
+void etox_line_prepend(Etox_Line * line, Evas_Object * bit)
{
- int x, y, w, h;
+ double x, y, w, h;
CHECK_PARAM_POINTER("line", line);
CHECK_PARAM_POINTER("bit", bit);
@@ -139,7 +139,7 @@
* Prepend the text and update necessary fields
*/
line->bits = evas_list_prepend(line->bits, bit);
- estyle_geometry(bit, &x, &y, &w, &h);
+ evas_object_geometry_get(bit, &x, &y, &w, &h);
line->w += w;
line->length += estyle_length(bit);
@@ -153,16 +153,16 @@
* Removes @bit from @line and updates the appearance of surrounding bits to
* reflect this change.
*/
-void etox_line_remove(Etox_Line * line, Estyle * bit)
+void etox_line_remove(Etox_Line * line, Evas_Object * bit)
{
- int w;
+ double w;
CHECK_PARAM_POINTER("line", line);
CHECK_PARAM_POINTER("bit", bit);
line->bits = evas_list_remove(line->bits, bit);
line->length -= estyle_length(bit);
- estyle_geometry(bit, NULL, NULL, &w, NULL);
+ evas_object_geometry_get(bit, NULL, NULL, &w, NULL);
line->w -= w;
/*
@@ -182,8 +182,8 @@
void etox_line_layout(Etox_Line * line)
{
int x;
- Estyle *bit;
- int tx, ty, tw, th;
+ Evas_Object *bit;
+ double tx, ty, tw, th;
Evas_List *l;
CHECK_PARAM_POINTER("line", line);
@@ -215,7 +215,7 @@
bit = l->data;
if (!estyle_fixed(bit)) {
- estyle_geometry(bit, &tx, &ty, &tw, &th);
+ evas_object_geometry_get(bit, &tx, &ty, &tw, &th);
if (line->h < th)
line->h = th;
@@ -232,7 +232,7 @@
/*
* Move the evas object into place.
*/
- estyle_move(bit, x, ty);
+ evas_object_move(bit, x, ty);
}
/*
@@ -247,7 +247,7 @@
*/
void etox_line_minimize(Etox_Line * line)
{
- Estyle *bit, *last_bit = NULL;
+ Evas_Object *bit, *last_bit = NULL;
Evas_List *l;
CHECK_PARAM_POINTER("line", line);
@@ -286,7 +286,7 @@
*/
void etox_line_merge_append(Etox_Line * line1, Etox_Line * line2)
{
- Estyle *bit;
+ Evas_Object *bit;
CHECK_PARAM_POINTER("line1", line1);
CHECK_PARAM_POINTER("line2", line2);
@@ -317,7 +317,7 @@
*/
void etox_line_merge_prepend(Etox_Line * line1, Etox_Line * line2)
{
- Estyle *bit;
+ Evas_Object *bit;
CHECK_PARAM_POINTER("line1", line1);
CHECK_PARAM_POINTER("line2", line2);
@@ -350,7 +350,7 @@
void etox_line_get_text(Etox_Line * line, char *buf)
{
char *temp;
- Estyle *es;
+ Evas_Object *es;
Evas_List *l;
CHECK_PARAM_POINTER("line", line);
@@ -374,8 +374,8 @@
etox_line_wrap(Etox *et, Etox_Line *line)
{
Evas_List *ll;
- Estyle *bit = NULL, *marker;
- int x, w, y, h;
+ Evas_Object *bit = NULL, *marker;
+ double x, w, y, h;
int index = -1;
/* iterate through the bits to find the one on the border */
@@ -383,7 +383,7 @@
while (ll) {
bit = ll->data;
- estyle_geometry(bit, &x, &y, &w, &h);
+ evas_object_geometry_get(bit, &x, &y, &w, &h);
if (x + w > et->x + et->w)
break;
@@ -404,24 +404,23 @@
while (isspace(tmp[index]))
index++;
FREE(tmp);
- }
-
- if (index >= 0 && index < estyle_length(bit)) {
etox_line_split(line, bit, index);
+
ll = evas_list_find_list(et->lines, line);
ll = ll->next;
/* create a marker bit. */
marker = estyle_new(et->evas, et->context->marker.text,
et->context->marker.style);
- estyle_set_color(marker, et->context->marker.r,
- et->context->marker.g, et->context->marker.b,
+ evas_object_color_set(marker, et->context->marker.r,
+ et->context->marker.g,
+ et->context->marker.b,
et->context->marker.a);
- estyle_set_clip(marker, et->clip);
+ evas_object_clip_set(marker, et->clip);
estyle_set_font(marker, et->context->font,
et->context->font_size);
- estyle_show(marker);
+ evas_object_show(marker);
etox_line_prepend(ll->data, marker);
}
else
@@ -431,11 +430,11 @@
}
void
-etox_line_split(Etox_Line *line, Estyle *bit, int index)
+etox_line_split(Etox_Line *line, Evas_Object *bit, int index)
{
Evas_List *ll;
Etox_Line *newline;
- Estyle *split = NULL;
+ Evas_Object *split = NULL;
ll = evas_list_find_list(line->bits, bit);
ll = ll->next;
@@ -451,17 +450,20 @@
/*
* If the bit starts on the boundary, simply move it to the next line.
*/
- if (index) {
- /* split the edge bit */
- split = etox_split_bit(line, bit, index);
- etox_line_remove(line, split);
+ if (index > 0) {
+ if (index < estyle_length(bit)) {
+ /* split the edge bit */
+ split = etox_split_bit(line, bit, index);
+ etox_line_remove(line, split);
+ }
}
else {
split = bit;
etox_line_remove(line, bit);
}
- etox_line_append(newline, split);
+ if (split)
+ etox_line_append(newline, split);
/*
* move the remaining bits to the new line
@@ -483,7 +485,7 @@
etox_line_unwrap(Etox *et, Etox_Line *line)
{
Evas_List *l, *prevline;
- Estyle *marker;
+ Evas_Object *marker;
if (!et->lines)
return;
@@ -499,7 +501,7 @@
/* remove the wrap marker bit */
marker = line->bits->data;
line->bits = evas_list_remove(line->bits, marker);
- estyle_free(marker);
+ evas_object_del(marker);
/* remove the line from the list */
et->lines = evas_list_remove(et->lines, line);
@@ -512,12 +514,12 @@
}
}
-Estyle *
+Evas_Object *
etox_line_coord_to_bit(Etox_Line *line, int x)
{
- int bx;
+ double bx;
Evas_List *l = NULL;
- Estyle *bit = NULL;
+ Evas_Object *bit = NULL;
/*
* Find the bit on this line
@@ -525,7 +527,7 @@
l = line->bits;
while (l) {
bit = l->data;
- estyle_geometry(bit, &bx, NULL, NULL, NULL);
+ evas_object_geometry_get(bit, &bx, NULL, NULL, NULL);
if (bx < x)
break;
l = l->next;
@@ -534,12 +536,12 @@
return bit;
}
-Estyle *
+Evas_Object *
etox_line_index_to_bit(Etox_Line *line, int *i)
{
int len = 0;
Evas_List *l = NULL;
- Estyle *bit = NULL;
+ Evas_Object *bit = NULL;
l = line->bits;
while (l) {
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/etox/src/etox_line.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- etox_line.h 1 Aug 2003 21:12:13 -0000 1.9
+++ etox_line.h 5 Aug 2003 18:45:36 -0000 1.10
@@ -5,20 +5,20 @@
void etox_line_free(Etox_Line * line);
void etox_line_show(Etox_Line * line);
void etox_line_hide(Etox_Line * line);
-void etox_line_append(Etox_Line * line, Estyle * bit);
-void etox_line_prepend(Etox_Line * line, Estyle * bit);
+void etox_line_append(Etox_Line * line, Evas_Object * bit);
+void etox_line_prepend(Etox_Line * line, Evas_Object * bit);
void etox_line_layout(Etox_Line * line);
-void etox_line_remove(Etox_Line * line, Estyle * bit);
+void etox_line_remove(Etox_Line * line, Evas_Object * bit);
void etox_line_merge_append(Etox_Line * line1, Etox_Line * line2);
void etox_line_merge_prepend(Etox_Line * line1, Etox_Line * line2);
void etox_line_minimize(Etox_Line * line);
void etox_line_get_text(Etox_Line * line, char *buf);
int etox_line_wrap(Etox *et, Etox_Line *line);
-void etox_line_split(Etox_Line *line, Estyle *bit, int index);
+void etox_line_split(Etox_Line *line, Evas_Object *bit, int index);
void etox_line_unwrap(Etox *et, Etox_Line *line);
-Estyle *etox_line_coord_to_bit(Etox_Line *line, int x);
-Estyle *etox_line_index_to_bit(Etox_Line *line, int *i);
+Evas_Object *etox_line_coord_to_bit(Etox_Line *line, int x);
+Evas_Object *etox_line_index_to_bit(Etox_Line *line, int *i);
void etox_line_print_bits(Etox_Line *line);
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/etox/src/etox_obstacle.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- etox_obstacle.c 26 Jul 2003 06:35:21 -0000 1.12
+++ etox_obstacle.c 5 Aug 2003 18:45:36 -0000 1.13
@@ -57,7 +57,7 @@
{
int i = 0;
int j = 0;
- int x, y, w, h;
+ double x, y, w, h;
Etox_Line *line;
Evas_List *l_nodes, *l;
@@ -67,7 +67,7 @@
* Check the simple return cases first, ie. does the obstacle fall
* outside of the etox.
*/
- estyle_geometry(obst->bit, &x, &y, &w, &h);
+ evas_object_geometry_get(obst->bit, &x, &y, &w, &h);
if (x > obst->et->x + obst->et->w)
return;
@@ -122,7 +122,7 @@
void etox_obstacle_unplace(Etox_Obstacle * obst)
{
int i, j;
- Estyle *bit;
+ Evas_Object *bit;
Etox_Line *line;
Evas_List *l, *ll;
@@ -163,23 +163,23 @@
static void _etox_obstacle_line_insert(Etox_Line * line,
Etox_Obstacle * obst)
{
- Estyle *bit;
- int x, y, w, h;
+ Evas_Object *bit;
+ double x, y, w, h;
Evas_List *l;
CHECK_PARAM_POINTER("line", line);
CHECK_PARAM_POINTER("obst", obst);
- estyle_geometry(obst->bit, &x, &y, &w, &h);
+ evas_object_geometry_get(obst->bit, &x, &y, &w, &h);
/*
* Find the position to place the obstacle within the line
*/
for (l = line->bits; l; l = l->next) {
- int tx, ty, tw, th;
+ double tx, ty, tw, th;
bit = l->data;
- estyle_geometry(bit, &tx, &ty, &tw, &th);
+ evas_object_geometry_get(bit, &tx, &ty, &tw, &th);
if (etox_rect_intersect(x, y, w, h, tx, ty, tw, th)) {
if (!bit)
return;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/etox/src/etox_selection.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- etox_selection.c 28 Jul 2003 22:04:31 -0000 1.4
+++ etox_selection.c 5 Aug 2003 18:45:36 -0000 1.5
@@ -4,20 +4,20 @@
#define SELECTION_LOOP_START(selected) \
do { \
- Estyle *bit = NULL; \
+ Evas_Object *bit = NULL; \
Etox_Line *line; \
Evas_List *l, *bl; \
- int w, h; \
+ double w, h; \
line = selected->start.line; \
l = evas_list_find_list(selected->etox->lines, selected->start.line); \
bl = evas_list_find_list(line->bits, selected->start.bit); \
while (bl && bit != selected->end.bit) { \
bit = bl->data; \
- estyle_geometry(bit, NULL, NULL, &w, NULL); \
+ evas_object_geometry_get(bit, NULL, NULL, &w, NULL); \
line->w -= w
#define SELECTION_LOOP_END \
- estyle_geometry(bit, NULL, NULL, &w, &h); \
+ evas_object_geometry_get(bit, NULL, NULL, &w, &h); \
line->w += w; \
if (h > line->h) \
line->h = h; \
@@ -33,11 +33,11 @@
} while (0)
-Estyle *
-etox_split_bit(Etox_Line *line, Estyle *bit, int index)
+Evas_Object *
+etox_split_bit(Etox_Line *line, Evas_Object *bit, int index)
{
Evas_List *l;
- Estyle *point = bit;
+ Evas_Object *point = bit;
Etox_Selection *selected;
/*
@@ -62,9 +62,9 @@
Etox_Selection *
etox_selection_new(Etox *etox, Etox_Line *l1, Etox_Line *l2,
- Estyle *s1, Estyle *s2, int i1, int i2)
+ Evas_Object *s1, Evas_Object *s2, int i1, int i2)
{
- Estyle *temp;
+ Evas_Object *temp;
Etox_Selection *selected;
/*
@@ -140,7 +140,7 @@
{
int i1, i2;
Etox_Line *sl, *el = NULL;
- Estyle *sb, *eb = NULL;
+ Evas_Object *sb, *eb = NULL;
Etox_Selection *selected = NULL;
sl = etox_coord_to_line(et, sy);
@@ -180,7 +180,7 @@
etox_select_index(Etox * et, int si, int ei)
{
Etox_Line *sl = NULL, *el = NULL;
- Estyle *sb = NULL, *eb = NULL;
+ Evas_Object *sb = NULL, *eb = NULL;
Etox_Selection *selected = NULL;
/*
@@ -282,7 +282,7 @@
selected->context->b = b;
SELECTION_LOOP_START(selected);
- estyle_set_color(bit, r, g, b, a);
+ evas_object_color_set(bit, r, g, b, a);
SELECTION_LOOP_END;
etox_layout(selected->etox);
@@ -306,7 +306,7 @@
SELECTION_LOOP_START(selected);
if (!bl->prev && line->flags & ETOX_LINE_WRAPPED) {
- estyle_set_color(bit, r, g, b, a);
+ evas_object_color_set(bit, r, g, b, a);
}
SELECTION_LOOP_END;
-------------------------------------------------------
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa00100003ave/direct;at.aspnet_072303_01/01
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
