Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/etox
Dir : e17/libs/etox/src/style
Modified Files:
etox_style.c
Log Message:
- add an etox_delete_text method
- has an issue with deleteing the last char (char dosen't disappear)
- acts a bit strange when deleting from the end (as seen in ewl_test entry)
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/etox/src/style/etox_style.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- etox_style.c 1 Oct 2004 19:42:34 -0000 1.4
+++ etox_style.c 6 Oct 2004 04:48:49 -0000 1.5
@@ -660,12 +660,8 @@
if (!BIT_MERGEABLE(es1, es2))
return FALSE;
- /*
- * These return a pointer to the actual text in the evas object, not a
- * copy of it. So don't free them.
- */
- text1 = (char *)evas_object_text_text_get(es1->bit);
- text2 = (char *)evas_object_text_text_get(es2->bit);
+ text1 = etox_style_get_text(obj1);
+ text2 = etox_style_get_text(obj2);
/*
* When the evas changes text it free's the old text, so malloc a new
@@ -678,9 +674,11 @@
strcpy(new_text, text1);
strcat(new_text, text2);
+ FREE(text1);
+ FREE(text2);
etox_style_set_text(obj1, new_text);
-
+
FREE(new_text);
evas_object_del(obj2);
@@ -736,6 +734,7 @@
*/
temp = content[index];
content[index] = '\0';
+
etox_style_set_text(obj, content);
/*
-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
