Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/ewl
Dir : e17/libs/ewl/src/bin Modified Files: ewl_embed_test.c ewl_entry_test.c ewl_image_test.c Log Message: - re-wrote the ewl_entry to work off of the new ewl_text. seems to work pretty well for the single line, may still be bugs tho. multiline needs some work, but part of that work will be in the textblock. =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/bin/ewl_embed_test.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- ewl_embed_test.c 28 May 2005 20:32:49 -0000 1.2 +++ ewl_embed_test.c 6 Jul 2005 13:44:38 -0000 1.3 @@ -20,10 +20,10 @@ char *txt; entry = user_data; - txt = ewl_entry_text_get(EWL_ENTRY(entry)); + txt = ewl_text_text_get(EWL_TEXT(entry)); printf("%s\n", txt); - ewl_entry_text_set(EWL_ENTRY(entry), "do it"); + ewl_text_text_set(EWL_TEXT(entry), "do it"); ewl_text_text_set(EWL_TEXT(text), txt); free(txt); } =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/bin/ewl_entry_test.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- ewl_entry_test.c 28 May 2005 20:32:49 -0000 1.2 +++ ewl_entry_test.c 6 Jul 2005 13:44:38 -0000 1.3 @@ -18,11 +18,11 @@ { char *s; - s = ewl_entry_text_get(EWL_ENTRY(entry[0])); + s = ewl_text_text_get(EWL_TEXT(entry[0])); printf("First entry covers: %s\n", s); FREE(s); - s = ewl_entry_text_get(EWL_ENTRY(entry[1])); + s = ewl_text_text_get(EWL_TEXT(entry[1])); printf("Second entry covers: %s\n", s); FREE(s); } @@ -31,12 +31,12 @@ __set_entry_text(Ewl_Widget *w __UNUSED__, void *ev_data __UNUSED__, void *user_data __UNUSED__) { - ewl_entry_color_set(EWL_ENTRY(entry[0]), 0, 0, 0, 255); - ewl_entry_color_set(EWL_ENTRY(entry[1]), 0, 0, 0, 255); - ewl_entry_text_set(EWL_ENTRY(entry[0]), "Play with me ?"); - ewl_entry_text_set(EWL_ENTRY(entry[1]), "E W L ! ! !"); - ewl_entry_color_set(EWL_ENTRY(entry[0]), 255, 0, 0, 255); - ewl_entry_color_set(EWL_ENTRY(entry[1]), 255, 0, 0, 255); + ewl_text_color_set(EWL_TEXT(entry[0]), 0, 0, 0, 255); + ewl_text_color_set(EWL_TEXT(entry[1]), 0, 0, 0, 255); + ewl_text_text_set(EWL_TEXT(entry[0]), "Play with me ?"); + ewl_text_text_set(EWL_TEXT(entry[1]), "E W L ! ! !"); + ewl_text_color_set(EWL_TEXT(entry[0]), 255, 0, 0, 255); + ewl_text_color_set(EWL_TEXT(entry[1]), 255, 0, 0, 255); } void @@ -73,8 +73,9 @@ ewl_box_spacing_set(EWL_BOX(entry_box), 10); ewl_widget_show(entry_box); - entry[0] = ewl_entry_multiline_new("Play with me ?"); - ewl_entry_color_set(EWL_ENTRY(entry[0]), 255, 0, 0, 255); + entry[0] = ewl_entry_new("Play with me ?"); + ewl_entry_multiline_set(EWL_ENTRY(entry[0]), 1); + ewl_text_color_set(EWL_TEXT(entry[0]), 255, 0, 0, 255); ewl_object_padding_set(EWL_OBJECT(entry[0]), 5, 5, 5, 0); ewl_container_child_append(EWL_CONTAINER(entry_box), entry[0]); ewl_callback_append(entry[0], EWL_CALLBACK_VALUE_CHANGED, @@ -82,7 +83,7 @@ ewl_widget_show(entry[0]); entry[1] = ewl_entry_new("E W L ! ! !"); - ewl_entry_color_set(EWL_ENTRY(entry[1]), 255, 0, 0, 255); + ewl_text_color_set(EWL_TEXT(entry[1]), 255, 0, 0, 255); ewl_object_padding_set(EWL_OBJECT(entry[1]), 5, 5, 0, 0); ewl_container_child_append(EWL_CONTAINER(entry_box), entry[1]); ewl_callback_append(entry[1], EWL_CALLBACK_VALUE_CHANGED, =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/bin/ewl_image_test.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- ewl_image_test.c 28 May 2005 20:32:49 -0000 1.2 +++ ewl_image_test.c 6 Jul 2005 13:44:38 -0000 1.3 @@ -51,7 +51,7 @@ if (!img) img = ecore_dlist_goto_last(images); - ewl_entry_text_set(EWL_ENTRY(entry_path), img); + ewl_text_text_set(EWL_TEXT(entry_path), img); ewl_image_file_set(EWL_IMAGE(image), img, NULL); ewl_widget_configure(image_win); @@ -63,7 +63,7 @@ { char *img = NULL; - img = ewl_entry_text_get(EWL_ENTRY(entry_path)); + img = ewl_text_text_get(EWL_TEXT(entry_path)); if (img && __image_exists(img)) { ecore_dlist_append(images, img); @@ -87,7 +87,7 @@ if (!img) img = ecore_dlist_goto_first(images); - ewl_entry_text_set(EWL_ENTRY(entry_path), img); + ewl_text_text_set(EWL_TEXT(entry_path), img); ewl_image_file_set(EWL_IMAGE(image), img, NULL); ewl_widget_configure(image_win); ------------------------------------------------------- SF.Net email is sponsored by: Discover Easy Linux Migration Strategies from IBM. Find simple to follow Roadmaps, straightforward articles, informative Webcasts and more! Get everything you need to get up to speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs