From f49c3bb8adfa90646ebc5c03ef833673f2a04af4 Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Sun, 30 Jan 2011 10:41:29 +0000 Subject: [PATCH] Used evas_textblock_text_node_changed instead of evas_textblock_changed when needed and removed the latter completely because it wasn't needed/used anymore. SVN revision: 56502 --- .../src/lib/canvas/evas_object_textblock.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/legacy/evas/src/lib/canvas/evas_object_textblock.c b/legacy/evas/src/lib/canvas/evas_object_textblock.c index 4628941d46..fbe96c2c15 100644 --- a/legacy/evas/src/lib/canvas/evas_object_textblock.c +++ b/legacy/evas/src/lib/canvas/evas_object_textblock.c @@ -509,7 +509,6 @@ static Eina_Bool _evas_textblock_format_is_visible(const char *s); static void _evas_textblock_node_format_remove(Evas_Object_Textblock *o, Evas_Object_Textblock_Node_Format *n, int visual_adjustment); static void _evas_textblock_node_format_free(Evas_Object_Textblock_Node_Format *n); static void _evas_textblock_node_text_free(Evas_Object_Textblock_Node_Text *n); -static void _evas_textblock_changed(Evas_Object_Textblock *o, Evas_Object *obj); static void _evas_textblock_text_node_changed(Evas_Object_Textblock *o, Evas_Object *obj, Evas_Object_Textblock_Node_Text *n); static void _evas_textblock_cursors_update_offset(const Evas_Textblock_Cursor *cur, const Evas_Object_Textblock_Node_Text *n, size_t start, int offset); static void _evas_textblock_cursors_set_node(Evas_Object_Textblock *o, const Evas_Object_Textblock_Node_Text *n, Evas_Object_Textblock_Node_Text *new_node); @@ -4716,7 +4715,7 @@ evas_textblock_node_format_remove_pair(Evas_Object *obj, /* pnode can never be visible! (it's the closing format) */ _evas_textblock_node_format_remove(o, pnode, 0); } - _evas_textblock_changed(o, obj); + _evas_textblock_text_node_changed(o, obj, tnode); } /** @@ -5953,22 +5952,6 @@ _evas_textblock_cursors_update_offset(const Evas_Textblock_Cursor *cur, } } -/** - * @internal - * Mark and notifiy that the textblock has changed. - * - * @param o the textblock object. - * @param obj the evas object. - */ -static void -_evas_textblock_changed(Evas_Object_Textblock *o, Evas_Object *obj) -{ - o->formatted.valid = 0; - o->changed = 1; - - evas_object_change(obj); -} - /** * @internal * Mark and notifiy that the textblock, and specifically a node has changed.