Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/etox
Dir : e17/libs/etox/test
Modified Files:
Etox_test.h etox_test.c selections.c
Log Message:
More API breakage. This time converting etox to smart objects.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/etox/test/Etox_test.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- Etox_test.h 29 Jul 2003 03:17:51 -0000 1.10
+++ Etox_test.h 6 Aug 2003 02:45:36 -0000 1.11
@@ -43,8 +43,8 @@
extern Evas_Object *o_txt_next_box;
extern Evas_List *pbuttons;
-extern Etox *e_msg;
-extern Etox *e_test;
+extern Evas_Object *e_msg;
+extern Evas_Object *e_test;
extern Evas *evas;
extern int render_method;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/etox/test/etox_test.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- etox_test.c 3 Aug 2003 05:05:05 -0000 1.29
+++ etox_test.c 6 Aug 2003 02:45:36 -0000 1.30
@@ -14,8 +14,8 @@
Evas *evas;
int render_method = 0;
-Etox *e_msg;
-Etox *e_test;
+Evas_Object *e_msg;
+Evas_Object *e_test;
Evas_List *current_test = NULL;
@@ -50,8 +50,8 @@
ex = pw + 10;
ey += 10;
- etox_move(e_msg, ex, 10);
- etox_resize(e_msg, ew, eh);
+ evas_object_move(e_msg, ex, 10);
+ evas_object_resize(e_msg, ew, eh);
evas_object_move(o_bg_etox, ex, ey);
evas_object_resize(o_bg_etox, ew, eh);
@@ -59,8 +59,8 @@
evas_object_move(clip_test, ex, ey);
evas_object_resize(clip_test, ew, eh);
- etox_move(e_test, ex, ey);
- etox_resize(e_test, ew, eh);
+ evas_object_move(e_test, ex, ey);
+ evas_object_resize(e_test, ew, eh);
return;
ee = NULL;
@@ -301,8 +301,8 @@
etox_context_set_color(e_msg, 225, 225, 225, 255);
etox_set_text(e_msg, msg);
etox_set_alpha(e_msg, 255);
- etox_set_layer(e_msg, 1000);
- etox_show(e_msg);
+ evas_object_layer_set(e_msg, 1000);
+ evas_object_show(e_msg);
/* Setup test etox */
/* Setup test etox background */
@@ -325,9 +325,9 @@
etox_context_set_style(e_test, "plain");
etox_context_set_color(e_test, 225, 225, 225, 255);
etox_set_text(e_test, "");
- etox_set_clip(e_test, clip_test);
+ evas_object_clip_set(e_test, clip_test);
etox_set_alpha(e_test, 255);
- etox_set_layer(e_test, 1000);
+ evas_object_layer_set(e_test, 1000);
/*
* Create the next test button
@@ -428,8 +428,8 @@
/* and now loop forever handling events */
ecore_main_loop_begin();
- etox_free(e_msg);
- etox_free(e_test);
+ evas_object_del(e_msg);
+ evas_object_del(e_test);
while (pbuttons) {
panel_button_free(pbuttons->data);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/etox/test/selections.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- selections.c 3 Aug 2003 05:05:05 -0000 1.7
+++ selections.c 6 Aug 2003 02:45:36 -0000 1.8
@@ -10,7 +10,7 @@
Ecore_Evas *ee;
Evas *evas;
Evas_Object *bg;
-Etox *etox;
+Evas_Object *etox;
char msg[] =
"The Etox Test utility consists in a series "
"of test suites designed to exercise all of "
@@ -85,40 +85,28 @@
etox_show(etox);
selected1 = etox_select_index(etox, 9, 60);
- printf("Selected %p\n", selected1);
if (selected1) {
- printf("Selected from %p to %p\n", selected1->start.bit,
- selected1->end.bit);
etox_selection_set_font(selected1, "morpheus", 20);
etox_selection_set_style(selected1, "outline");
etox_selection_set_color(selected1, 255, 0, 0, 255);
}
selected2 = etox_select_index(etox, 0, 20);
- printf("Selected %p\n", selected2);
if (selected2) {
- printf("Selected from %p to %p\n", selected2->start.bit,
- selected2->end.bit);
etox_selection_set_color(selected2, 0, 0, 255, 255);
}
etox_selection_free(selected1);
selected1 = etox_select_index(etox, 59, 200);
- printf("Selected %p\n", selected1);
if (selected1) {
- printf("Selected from %p to %p\n", selected1->start.bit,
- selected1->end.bit);
etox_selection_set_style(selected1, "outline");
}
etox_selection_free(selected2);
selected2 = etox_select_index(etox, 200, 1000);
- printf("Selected %p\n", selected2);
if (selected2) {
- printf("Selected from %p to %p\n", selected2->start.bit,
- selected2->end.bit);
etox_selection_set_color(selected2, 0, 0, 255, 255);
}
-------------------------------------------------------
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa00100003ave/direct;at.aspnet_072303_01/01
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
