Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_entry.c
Log Message:
no more old textblock - gone. completely. tb2 renamed (as threatened) to
textblock. updated edje and e17.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_entry.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- e_entry.c 27 Oct 2005 02:44:36 -0000 1.10
+++ e_entry.c 28 Oct 2005 02:56:26 -0000 1.11
@@ -92,8 +92,8 @@
if ((!object) || !(editable_text_sd = evas_object_smart_data_get(object)))
return "";
- cursor = (Evas_Textblock_Cursor
*)evas_object_textblock2_cursor_get(editable_text_sd->text_object);
- return evas_textblock2_cursor_node_text_get(cursor);
+ cursor = (Evas_Textblock_Cursor
*)evas_object_textblock_cursor_get(editable_text_sd->text_object);
+ return evas_textblock_cursor_node_text_get(cursor);
}
/**
@@ -109,7 +109,7 @@
if ((!object) || (!text) || !(editable_text_sd =
evas_object_smart_data_get(object)))
return;
- evas_object_textblock2_text_markup_set(editable_text_sd->text_object, text);
+ evas_object_textblock_text_markup_set(editable_text_sd->text_object, text);
editable_text_sd->cursor_at_the_end = 1;
_e_editable_text_size_update(object);
_e_editable_text_cursor_position_update(object);
@@ -132,12 +132,12 @@
return;
printf("Insert: \"%s\", %c\n", text, *text);
- cursor = (Evas_Textblock_Cursor
*)evas_object_textblock2_cursor_get(editable_text_sd->text_object);
+ cursor = (Evas_Textblock_Cursor
*)evas_object_textblock_cursor_get(editable_text_sd->text_object);
if (editable_text_sd->cursor_at_the_end)
- evas_textblock2_cursor_text_append(cursor, text);
+ evas_textblock_cursor_text_append(cursor, text);
else
- evas_textblock2_cursor_text_prepend(cursor, text);
+ evas_textblock_cursor_text_prepend(cursor, text);
_e_editable_text_size_update(object);
_e_editable_text_cursor_position_update(object);
}
@@ -157,10 +157,10 @@
(_e_editable_text_is_empty(object)))
return;
- cursor = (Evas_Textblock_Cursor
*)evas_object_textblock2_cursor_get(editable_text_sd->text_object);
+ cursor = (Evas_Textblock_Cursor
*)evas_object_textblock_cursor_get(editable_text_sd->text_object);
- if ((editable_text_sd->cursor_at_the_end) ||
(evas_textblock2_cursor_char_prev(cursor)))
- evas_textblock2_cursor_char_delete(cursor);
+ if ((editable_text_sd->cursor_at_the_end) ||
(evas_textblock_cursor_char_prev(cursor)))
+ evas_textblock_cursor_char_delete(cursor);
_e_editable_text_size_update(object);
_e_editable_text_cursor_position_update(object);
@@ -181,15 +181,15 @@
(_e_editable_text_is_empty(object)))
return;
- cursor = (Evas_Textblock_Cursor
*)evas_object_textblock2_cursor_get(editable_text_sd->text_object);
+ cursor = (Evas_Textblock_Cursor
*)evas_object_textblock_cursor_get(editable_text_sd->text_object);
if (!editable_text_sd->cursor_at_the_end)
{
- if (!evas_textblock2_cursor_char_next(cursor))
+ if (!evas_textblock_cursor_char_next(cursor))
editable_text_sd->cursor_at_the_end = 1;
else
- evas_textblock2_cursor_char_prev(cursor);
- evas_textblock2_cursor_char_delete(cursor);
+ evas_textblock_cursor_char_prev(cursor);
+ evas_textblock_cursor_char_delete(cursor);
}
_e_editable_text_size_update(object);
@@ -211,9 +211,9 @@
(_e_editable_text_is_empty(object)))
return;
- cursor = (Evas_Textblock_Cursor
*)evas_object_textblock2_cursor_get(editable_text_sd->text_object);
+ cursor = (Evas_Textblock_Cursor
*)evas_object_textblock_cursor_get(editable_text_sd->text_object);
editable_text_sd->cursor_at_the_end = 0;
- evas_textblock2_cursor_char_first(cursor);
+ evas_textblock_cursor_char_first(cursor);
_e_editable_text_cursor_position_update(object);
}
@@ -233,9 +233,9 @@
(_e_editable_text_is_empty(object)))
return;
- cursor = (Evas_Textblock_Cursor
*)evas_object_textblock2_cursor_get(editable_text_sd->text_object);
+ cursor = (Evas_Textblock_Cursor
*)evas_object_textblock_cursor_get(editable_text_sd->text_object);
editable_text_sd->cursor_at_the_end = 1;
- evas_textblock2_cursor_char_last(cursor);
+ evas_textblock_cursor_char_last(cursor);
_e_editable_text_cursor_position_update(object);
}
@@ -253,11 +253,11 @@
if ((!object) || !(editable_text_sd = evas_object_smart_data_get(object)))
return;
- cursor = (Evas_Textblock_Cursor
*)evas_object_textblock2_cursor_get(editable_text_sd->text_object);
+ cursor = (Evas_Textblock_Cursor
*)evas_object_textblock_cursor_get(editable_text_sd->text_object);
if (editable_text_sd->cursor_at_the_end)
editable_text_sd->cursor_at_the_end = 0;
else
- evas_textblock2_cursor_char_prev(cursor);
+ evas_textblock_cursor_char_prev(cursor);
_e_editable_text_size_update(object);
_e_editable_text_cursor_position_update(object);
@@ -276,8 +276,8 @@
if ((!object) || !(editable_text_sd = evas_object_smart_data_get(object)))
return;
- cursor = (Evas_Textblock_Cursor
*)evas_object_textblock2_cursor_get(editable_text_sd->text_object);
- if (!evas_textblock2_cursor_char_next(cursor))
+ cursor = (Evas_Textblock_Cursor
*)evas_object_textblock_cursor_get(editable_text_sd->text_object);
+ if (!evas_textblock_cursor_char_next(cursor))
editable_text_sd->cursor_at_the_end = 1;
_e_editable_text_size_update(object);
@@ -484,8 +484,8 @@
if ((!object) || !(editable_text_sd = evas_object_smart_data_get(object)))
return 1;
- cursor = (Evas_Textblock_Cursor
*)evas_object_textblock2_cursor_get(editable_text_sd->text_object);
- return (evas_textblock2_cursor_node_text_length_get(cursor) <= 0);
+ cursor = (Evas_Textblock_Cursor
*)evas_object_textblock_cursor_get(editable_text_sd->text_object);
+ return (evas_textblock_cursor_node_text_length_get(cursor) <= 0);
}
/* Updates the size of the text object: to be called when the text of the
object is changed */
@@ -498,7 +498,7 @@
if ((!object) || !(editable_text_sd = evas_object_smart_data_get(object)))
return;
- evas_object_textblock2_size_native_get(editable_text_sd->text_object, &w,
&h);
+ evas_object_textblock_size_native_get(editable_text_sd->text_object, &w,
&h);
evas_object_resize(editable_text_sd->text_object, w, h);
}
@@ -515,7 +515,7 @@
evas_object_geometry_get(editable_text_sd->text_object, &tx, &ty, &tw, &th);
evas_object_geometry_get(object, &ox, &oy, &ow, &oh);
- cursor = (Evas_Textblock_Cursor
*)evas_object_textblock2_cursor_get(editable_text_sd->text_object);
+ cursor = (Evas_Textblock_Cursor
*)evas_object_textblock_cursor_get(editable_text_sd->text_object);
if (_e_editable_text_is_empty(object))
{
@@ -525,13 +525,13 @@
}
else if (editable_text_sd->cursor_at_the_end)
{
- evas_textblock2_cursor_char_last(cursor);
- evas_textblock2_cursor_char_geometry_get(cursor, &cx, &cy, &cw, &ch);
+ evas_textblock_cursor_char_last(cursor);
+ evas_textblock_cursor_char_geometry_get(cursor, &cx, &cy, &cw, &ch);
cx += tx + cw;
}
else
{
- evas_textblock2_cursor_char_geometry_get(cursor, &cx, &cy, &cw, &ch);
+ evas_textblock_cursor_char_geometry_get(cursor, &cx, &cy, &cw, &ch);
cx += tx;
}
@@ -628,8 +628,8 @@
if (!e_editable_text_style)
{
- e_editable_text_style = evas_textblock2_style_new();
- evas_textblock2_style_set(e_editable_text_style, "DEFAULT='font=Vera
font_size=10 align=left color=#000000 wrap=word'");
+ e_editable_text_style = evas_textblock_style_new();
+ evas_textblock_style_set(e_editable_text_style, "DEFAULT='font=Vera
font_size=10 align=left color=#000000 wrap=word'");
e_editable_text_style_use_count = 0;
}
@@ -639,8 +639,8 @@
editable_text_sd->cursor_at_the_end = 1;
editable_text_sd->cursor_timer = NULL;
- editable_text_sd->text_object = evas_object_textblock2_add(evas);
- evas_object_textblock2_style_set(editable_text_sd->text_object,
e_editable_text_style);
+ editable_text_sd->text_object = evas_object_textblock_add(evas);
+ evas_object_textblock_style_set(editable_text_sd->text_object,
e_editable_text_style);
e_editable_text_style_use_count++;
evas_object_smart_member_add(editable_text_sd->text_object, object);
@@ -654,8 +654,8 @@
evas_object_smart_data_set(object, editable_text_sd);
- cursor = (Evas_Textblock_Cursor
*)evas_object_textblock2_cursor_get(editable_text_sd->text_object);
- evas_textblock2_cursor_node_first(cursor);
+ cursor = (Evas_Textblock_Cursor
*)evas_object_textblock_cursor_get(editable_text_sd->text_object);
+ evas_textblock_cursor_node_first(cursor);
evas_font_path_append (evas, PACKAGE_DATA_DIR"/data/fonts");
}
@@ -680,7 +680,7 @@
e_editable_text_style_use_count--;
if ((e_editable_text_style_use_count <= 0) && (e_editable_text_style))
{
- evas_textblock2_style_free(e_editable_text_style);
+ evas_textblock_style_free(e_editable_text_style);
e_editable_text_style = NULL;
}
}
-------------------------------------------------------
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
