Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_calc.c edje_load.c edje_textblock_styles.c
Log Message:
no more old textblock - gone. completely. tb2 renamed (as threatened) to
textblock. updated edje and e17.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_calc.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -3 -r1.70 -r1.71
--- edje_calc.c 4 Oct 2005 17:57:20 -0000 1.70
+++ edje_calc.c 28 Oct 2005 02:56:27 -0000 1.71
@@ -472,13 +472,13 @@
{
const char *ptxt;
- if (evas_object_textblock2_style_get(ep->object) != stl->style)
- evas_object_textblock2_style_set(ep->object, stl->style);
- ptxt = evas_object_textblock2_text_markup_get(ep->object);
+ if (evas_object_textblock_style_get(ep->object) != stl->style)
+ evas_object_textblock_style_set(ep->object, stl->style);
+ ptxt = evas_object_textblock_text_markup_get(ep->object);
if (((!ptxt) && (text)) ||
((ptxt) && (text) && (strcmp(ptxt, text))) ||
((ptxt) && (!text)))
- evas_object_textblock2_text_markup_set(ep->object, text);
+ evas_object_textblock_text_markup_set(ep->object, text);
if ((chosen_desc->text.min_x) || (chosen_desc->text.min_y))
{
int mw = 0, mh = 0;
@@ -487,11 +487,11 @@
if (!chosen_desc->text.min_x)
{
evas_object_resize(ep->object, params->w, params->h);
- evas_object_textblock2_size_formatted_get(ep->object,
&tw, &th);
+ evas_object_textblock_size_formatted_get(ep->object,
&tw, &th);
}
else
- evas_object_textblock2_size_native_get(ep->object, &tw,
&th);
- evas_object_textblock2_style_insets_get(ep->object, &ins_l,
&ins_r, &ins_t, &ins_b);
+ evas_object_textblock_size_native_get(ep->object, &tw, &th);
+ evas_object_textblock_style_insets_get(ep->object, &ins_l,
&ins_r, &ins_t, &ins_b);
mw = ins_l + tw + ins_r;
mh = ins_t + th + ins_b;
if (chosen_desc->text.min_x)
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_load.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -3 -r1.73 -r1.74
--- edje_load.c 23 Oct 2005 00:15:45 -0000 1.73
+++ edje_load.c 28 Oct 2005 02:56:27 -0000 1.74
@@ -164,7 +164,7 @@
evas_object_pass_events_set(rp->object, 1);
}
else if (ep->type == EDJE_PART_TYPE_TEXTBLOCK)
- rp->object = evas_object_textblock2_add(ed->evas);
+ rp->object = evas_object_textblock_add(ed->evas);
else
{
printf("EDJE ERROR: wrong part type %i!\n", ep->type);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_textblock_styles.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- edje_textblock_styles.c 7 Oct 2005 11:26:15 -0000 1.2
+++ edje_textblock_styles.c 28 Oct 2005 02:56:27 -0000 1.3
@@ -236,8 +236,8 @@
stl = l->data;
if (stl->style) break;
- stl->style = evas_textblock2_style_new();
- evas_textblock2_style_set(stl->style, (const char *)buf);
+ stl->style = evas_textblock_style_new();
+ evas_textblock_style_set(stl->style, (const char *)buf);
def_done = 0;
/* FIXME: i think we have no choice by to parse the style line,
* look for font= tags and IF that font is in the .edj then prepend
@@ -298,7 +298,7 @@
}
if (fontset) free(fontset);
if (fontsource) free(fontsource);
- evas_textblock2_style_set(stl->style, (const char *)buf);
+ evas_textblock_style_set(stl->style, (const char *)buf);
free(buf);
}
}
@@ -323,7 +323,7 @@
free(tag);
}
if (stl->name) free(stl->name);
- if (stl->style) evas_textblock2_style_free(stl->style);
+ if (stl->style) evas_textblock_style_free(stl->style);
free(stl);
}
}
-------------------------------------------------------
This SF.Net email is sponsored by the JBoss Inc.
Get Certified Today * Register for a JBoss Training Course
Free Certification Exam for All Training Attendees Through End of 2005
Visit http://www.jboss.com/services/certification for more information
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
