Enlightenment CVS committal
Author : rephorm
Project : e17
Module : libs/etox
Dir : e17/libs/etox/test
Modified Files:
etox_test.c selections.c tests.c
Log Message:
update tests to the new context API.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/etox/test/etox_test.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- etox_test.c 6 Aug 2003 02:45:36 -0000 1.30
+++ etox_test.c 20 Aug 2003 17:38:04 -0000 1.31
@@ -295,10 +295,11 @@
/* Create message etox */
e_msg = etox_new_all(evas, ex, 10, ew, eh , 255, ETOX_ALIGN_LEFT);
- etox_context_set_align(e_msg, ETOX_ALIGN_LEFT);
- etox_context_set_font(e_msg, "sinon", 14);
- etox_context_set_style(e_msg, "shadow");
- etox_context_set_color(e_msg, 225, 225, 225, 255);
+ etox_context_set_align(etox_get_context(e_msg), ETOX_ALIGN_LEFT);
+ etox_context_set_font(etox_get_context(e_msg), "sinon", 14);
+ etox_context_set_style(etox_get_context(e_msg), "shadow");
+ etox_context_set_color(etox_get_context(e_msg), 225, 225, 225, 255);
+ etox_context_set_soft_wrap(etox_get_context(e_msg), 1);
etox_set_text(e_msg, msg);
etox_set_alpha(e_msg, 255);
evas_object_layer_set(e_msg, 1000);
@@ -321,9 +322,9 @@
/* Create test etox */
e_test = etox_new_all(evas, ex, ey, ew, eh, 255, ETOX_ALIGN_CENTER);
- etox_context_set_font(e_test, "sinon", 14);
- etox_context_set_style(e_test, "plain");
- etox_context_set_color(e_test, 225, 225, 225, 255);
+ etox_context_set_font(etox_get_context(e_test), "sinon", 14);
+ etox_context_set_style(etox_get_context(e_test), "plain");
+ etox_context_set_color(etox_get_context(e_test), 225, 225, 225, 255);
etox_set_text(e_test, "");
evas_object_clip_set(e_test, clip_test);
etox_set_alpha(e_test, 255);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/etox/test/selections.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- selections.c 20 Aug 2003 00:44:43 -0000 1.12
+++ selections.c 20 Aug 2003 17:38:04 -0000 1.13
@@ -48,6 +48,7 @@
int main(int argc, const char **argv)
{
+ Etox_Context *ec;
/*
Etox_Selection *selected1;
Etox_Selection *selected2;
@@ -82,10 +83,11 @@
/* Create message etox */
etox = etox_new_all(evas, 0, 0, win_w, win_h, 255,
ETOX_ALIGN_LEFT | ETOX_ALIGN_BOTTOM);
- etox_context_set_font(etox, "Vera", 14);
- etox_context_set_color(etox, 173, 193, 79, 255);
- etox_context_set_style(etox, "shadow");
- etox_context_set_soft_wrap(etox, 1);
+ ec = etox_get_context(etox);
+ etox_context_set_font(ec, "Vera", 14);
+ etox_context_set_color(ec, 173, 193, 79, 255);
+ etox_context_set_style(ec, "shadow");
+ etox_context_set_soft_wrap(ec, 1);
etox_set_text(etox, msg);
etox_set_alpha(etox, 255);
etox_set_layer(etox, 1000);
@@ -142,32 +144,26 @@
_test_sel1(Evas_Object *etox)
{
Etox_Selection *sel;
- Etox_Context *old, *cont;
+ Etox_Context *cont;
- printf("style: %s\n", etox_context_get_style(etox));
+ printf("style: %s\n", etox_context_get_style(etox_get_context(etox)));
sel = etox_select_index(etox, 10, 120);
- old = etox_context_save(etox);
-
- etox_context_set_color(etox, 220, 0, 0, 255);
- etox_context_set_font(etox, "Vera", 12);
cont = etox_context_save(etox);
+
+ etox_context_set_color(cont, 220, 0, 0, 255);
+ etox_context_set_font(cont, "Vera", 12);
etox_selection_apply_context(sel, cont);
etox_selection_free_by_etox(etox);
sel = etox_select_index(etox, 50, 200);
- etox_context_set_color(etox, 200, 102, 10, 255);
- etox_context_free(cont);
- cont = etox_context_save(etox);
+ etox_context_set_color(cont, 200, 102, 10, 255);
etox_selection_apply_context(sel, cont);
- etox_context_load(etox, old);
-
- printf("style: %s\n", etox_context_get_style(etox));
+ printf("style: %s\n", etox_context_get_style(etox_get_context(etox)));
etox_append_text(etox, " Blah. Blah. Blum de dum.");
etox_context_free(cont);
- etox_context_free(old);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/etox/test/tests.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- tests.c 1 Aug 2003 21:12:13 -0000 1.12
+++ tests.c 20 Aug 2003 17:38:04 -0000 1.13
@@ -182,7 +182,7 @@
etox_set_text(e_msg, msg);
etox_set_text(e_test, "");
- etox_context_set_style(e_test, "plain");
+ etox_context_set_style(etox_get_context(e_test), "plain");
etox_set_text(e_test, string);
etox_show(e_test);
@@ -200,7 +200,7 @@
etox_set_text(e_msg, msg);
etox_set_text(e_test, "");
- etox_context_set_style(e_test, "bold");
+ etox_context_set_style(etox_get_context(e_test), "bold");
etox_set_text(e_test, string);
etox_show(e_test);
@@ -218,7 +218,7 @@
etox_set_text(e_msg, msg);
etox_set_text(e_test, "");
- etox_context_set_style(e_test, "outline");
+ etox_context_set_style(etox_get_context(e_test), "outline");
etox_set_text(e_test, string);
etox_show(e_test);
@@ -236,7 +236,7 @@
etox_set_text(e_msg, msg);
etox_set_text(e_test, "");
- etox_context_set_style(e_test, "raised");
+ etox_context_set_style(etox_get_context(e_test), "raised");
etox_set_text(e_test, string);
etox_show(e_test);
@@ -254,7 +254,7 @@
etox_set_text(e_msg, msg);
etox_set_text(e_test, "");
- etox_context_set_style(e_test, "shadow");
+ etox_context_set_style(etox_get_context(e_test), "shadow");
etox_set_text(e_test, string);
etox_show(e_test);
-------------------------------------------------------
This SF.net email is sponsored by Dice.com.
Did you know that Dice has over 25,000 tech jobs available today? From
careers in IT to Engineering to Tech Sales, Dice has tech jobs from the
best hiring companies. http://www.dice.com/index.epl?rel_code=104
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
