Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src
Modified Files:
ewl_textarea.c ewl_textarea.h
Log Message:
Update EWL to use the new etox api. This seems to cause a loop problem, I'll
fix that up tomorrow.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_textarea.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- ewl_textarea.c 13 Jul 2003 05:52:49 -0000 1.11
+++ ewl_textarea.c 6 Aug 2003 03:14:23 -0000 1.12
@@ -114,7 +114,7 @@
*
* Returns a pointer to the textarea's etox on success, NULL on failure.
*/
-Etox *ewl_textarea_get_etox(Ewl_TextArea * ta)
+Evas_Object *ewl_textarea_get_etox(Ewl_TextArea * ta)
{
DCHECK_PARAM_PTR_RET("ta", ta, NULL);
@@ -219,7 +219,7 @@
* Now set the text and display it.
*/
etox_set_text(ta->etox, ta->text);
- etox_show(ta->etox);
+ evas_object_show(ta->etox);
/*
* Update the size of the textarea
@@ -242,9 +242,9 @@
* Update the etox position and size.
*/
if (ta->etox) {
- etox_move(ta->etox, CURRENT_X(w) + INSET_LEFT(w),
+ evas_object_move(ta->etox, CURRENT_X(w) + INSET_LEFT(w),
CURRENT_Y(w) + INSET_TOP(w));
- etox_set_layer(ta->etox, LAYER(w));
+ evas_object_layer_set(ta->etox, LAYER(w));
}
DLEAVE_FUNCTION(DLEVEL_STABLE);
@@ -263,7 +263,7 @@
* Change the clipping of the etox to the new parent.
*/
if (ta->etox)
- etox_set_clip(ta->etox, w->fx_clip_box);
+ evas_object_clip_set(ta->etox, w->fx_clip_box);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -273,12 +273,12 @@
*/
void __ewl_textarea_update_size(Ewl_TextArea * ta)
{
- int x, y, width, height;
+ double x, y, width, height;
/*
* Adjust the properties of the widget to indicate the size of the text.
*/
- etox_get_geometry(ta->etox, &x, &y, &width, &height);
+ evas_object_geometry_get(ta->etox, &x, &y, &width, &height);
width += INSET_LEFT(ta) + INSET_RIGHT(ta);
height += INSET_TOP(ta) + INSET_BOTTOM(ta);
@@ -287,6 +287,13 @@
* Set the preferred size to the size of the etox and request that
* size for the widget.
*/
- ewl_object_set_preferred_size(EWL_OBJECT(ta), width, height);
- ewl_object_set_custom_size(EWL_OBJECT(ta), width, height);
+ ewl_object_set_preferred_size(EWL_OBJECT(ta), (unsigned int)(width),
+ (unsigned int)(height));
+
+ /*
+ * FIXME: Should we really be doing this? Probably not, test it out
+ * more thoroughly.
+ */
+ ewl_object_set_custom_size(EWL_OBJECT(ta), (unsigned int)(width),
+ (unsigned int)(height));
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_textarea.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ewl_textarea.h 25 May 2002 05:46:42 -0000 1.4
+++ ewl_textarea.h 6 Aug 2003 03:14:24 -0000 1.5
@@ -11,7 +11,7 @@
char *text;
- Etox *etox;
+ Evas_Object *etox;
Etox_Context *etox_context;
};
@@ -21,7 +21,7 @@
void ewl_textarea_set_text(Ewl_TextArea * ta, char *text);
char *ewl_textarea_get_text(Ewl_TextArea * ta);
-Etox *ewl_textarea_get_etox(Ewl_TextArea * ta);
+Evas_Object *ewl_textarea_get_etox(Ewl_TextArea * ta);
void ewl_textarea_set_context(Ewl_TextArea * ta,
Etox_Context * context);
Etox_Context *ewl_textarea_get_context(Ewl_TextArea * ta);
-------------------------------------------------------
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
