Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/canvas
Modified Files:
evas_callbacks.c evas_clip.c evas_events.c evas_focus.c
evas_key.c evas_key_grab.c evas_main.c evas_object_gradient.c
evas_object_image.c evas_object_intercept.c evas_object_line.c
evas_object_main.c evas_object_polygon.c evas_object_smart.c
evas_object_text.c evas_smart.c evas_stack.c
Log Message:
move co-ordinates to be their own type. this is a good thing, because ti
allows me to be able to virtualize he canvas co-ordinate system. right now
it's doubles. i can now move to floats, int's etc. with a recompile (and well
recompile all depending apps too). it's still ACTUALLY doubles, just all
typedef'ed now. i've also changed booleans to actual boolean types (not an
int), all code will keep working - but i'd highly suggest moving your code to
use these types if interacting with evas.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_callbacks.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- evas_callbacks.c 25 May 2003 09:43:53 -0000 1.12
+++ evas_callbacks.c 18 Oct 2003 03:34:00 -0000 1.13
@@ -43,8 +43,6 @@
static void
evas_object_event_callback_clear(Evas_Object *obj)
{
- Evas_Callback_Type t;
-
if (!obj->callbacks) return;
if (!obj->callbacks->deletions_waiting) return;
obj->callbacks->deletions_waiting = 0;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_clip.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- evas_clip.c 9 Oct 2003 03:05:17 -0000 1.5
+++ evas_clip.c 18 Oct 2003 03:34:00 -0000 1.6
@@ -90,7 +90,31 @@
* @param clip The object to clip @p obj by
*
* This function will clip the object @p obj to the area occupied by the
- * object @p clipper.
+ * object @p clipper. This means the object @p obj will only be visible within
+ * the area occupied by the clipping object (@p clip). The color of the object
+ * being clipped will be multiplied by the color of the clipping object, so
+ * the resulting color for the clipped object is
+ * RESULT = (OBJ * CLIP) / (255 * 255) per color element (red, green, blue and
+ * alpha). Clipping is recursive, so clip objects may be clipped by other
+ * objects, and their color will in tern be multiplied. You may NOT set up
+ * circular clipping lists (i.e. object 1 clips object 2 which clips object 2).
+ * The behavior of Evas is undefined in this case. Objects which do not clip
+ * others are visible as normal, those that clip 1 or more objects become
+ * invisible themselves, only affecting what they clip. If an object ceases to
+ * have other objects being clipped by it, it will become visible again. The
+ * visibility of an object affects the objects that are clipped by it, so if
+ * the object clipping others is now shown, the objects clipped will not be
+ * shown either. If the object was being clipped by another object when this
+ * function is called, it is implicitly removed from the clipper it is being
+ * clipped to, and now is made to clip its new clipper.
+ *
+ * At the moment the only objects that can validly be used to clip other
+ * objects are rectangle objects. All other objects types are invalid and the
+ * results of using them is undefined.
+ *
+ * The clip object @p clip must be a valid object, but may also be NULL in
+ * which case the effect of this function is the same as calling
+ * evas_object_clip_unset() on the @p obj object.
*
* Example:
* @code
@@ -150,9 +174,23 @@
}
/**
- * To be documented.
+ * Get the object clipping this one (if any).
+ * @param obj The object to get the clipper from
*
- * FIXME: To be fixed.
+ * This function returns the the object clipping @p obj. If it is not being
+ * clipped, NULL is returned. The object @p obj must be a valid object.
+ *
+ * See also evas_object_clip_set(), evas_object_clipees_get() and
+ * evas_object_clipees_get().
+ *
+ * Example:
+ * @code
+ * extern Evas_Object *obj;
+ * Evas_Object *clipper;
+ *
+ * clipper = evas_object_clip_get(obj);
+ * if (clipper) evas_object_show(clipper);
+ * @endcode
*
*/
Evas_Object *
@@ -165,9 +203,29 @@
}
/**
- * To be documented.
+ * Disable clipping for an object.
*
- * FIXME: To be fixed.
+ * @param obj The object to cease clipping on
+ *
+ * This function disables clipping for the object @p obj, if it was already
+ * clipped. If it wasn't, this has no effect. The object @p obj must be a
+ * valid object.
+ *
+ * See also evas_object_clip_set(), evas_object_clipees_get() and
+ * evas_object_clip_get().
+ *
+ * Example:
+ * @code
+ * extern Evas_Object *obj;
+ * Evas_Object *clipper;
+ *
+ * clipper = evas_object_clip_get(obj);
+ * if (clipper)
+ * {
+ * evas_object_clip_unset(obj);
+ * evas_object_hide(obj);
+ * }
+ * @endcode
*
*/
void
@@ -199,9 +257,45 @@
}
/**
- * To be documented.
+ * Return a list of objects currently clipped by a specific object.
+ *
+ * @param obj The object to get a list of clippees from
+ *
+ * This returns the inernal list handle that contains all objects clipped by
+ * the object @p obj. If none are clipped, it returns NULL. This list is only
+ * valid and should be fetched again with another call to
+ * evas_object_clipees_get() if any objects being clipped by this object are
+ * unclipped, clipped by a new object, are deleted or the clipper is deleted.
+ * These operations will invalidate the list returned and so it should not be
+ * used anymore after that point. Any use of the list after this may have
+ * undefined results, not limited just to strange behavior but possible
+ * segfaults and other strange memory errors. The object @p obj must be a
+ * valid object.
*
- * FIXME: To be fixed.
+ * See also evas_object_clip_set(), evas_object_clip_unset() and
+ * evas_object_clip_get().
+ *
+ * Example:
+ * @code
+ * extern Evas_Object *obj;
+ * Evas_Object *clipper;
+ *
+ * clipper = evas_object_clip_get(obj);
+ * if (clipper)
+ * {
+ * Evas_List *clippees, *l;
+ *
+ * clippees = evas_object_clipees_get(clipper);
+ * printf("Clipper clips %i objects\n", evas_list_count(clippees));
+ * for (l = clippees; l; l = l->next)
+ * {
+ * Evas_Object *obj_tmp;
+ *
+ * obj_tmp = l->data;
+ * evas_object_show(obj_tmp);
+ * }
+ * }
+ * @endcode
*
*/
const Evas_List *
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_events.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- evas_events.c 16 Jul 2003 07:39:28 -0000 1.12
+++ evas_events.c 18 Oct 2003 03:34:00 -0000 1.13
@@ -145,7 +145,6 @@
evas_event_feed_mouse_wheel_data(Evas *e, int direction, int z, const void *data)
{
Evas_List *l, *copy;
- Evas_Object *obj;
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return;
@@ -290,7 +289,7 @@
evas_event_feed_mouse_move_data(Evas *e, int x, int y, const void *data)
{
int px, py;
- double pcx, pcy;
+ Evas_Coord pcx, pcy;
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return;
@@ -482,6 +481,8 @@
return;
MAGIC_CHECK_END();
e->pointer.inside = 1;
+ return;
+ data = NULL;
}
/**
@@ -497,6 +498,8 @@
return;
MAGIC_CHECK_END();
e->pointer.inside = 0;
+ return;
+ data = NULL;
}
/**
@@ -758,7 +761,7 @@
*
*/
void
-evas_object_pass_events_set(Evas_Object *obj, int pass)
+evas_object_pass_events_set(Evas_Object *obj, Evas_Bool pass)
{
MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
return;
@@ -778,7 +781,7 @@
* FIXME: To be fixed.
*
*/
-int
+Evas_Bool
evas_object_pass_events_get(Evas_Object *obj)
{
MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
@@ -794,7 +797,7 @@
*
*/
void
-evas_object_repeat_events_set(Evas_Object *obj, int repeat)
+evas_object_repeat_events_set(Evas_Object *obj, Evas_Bool repeat)
{
MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
return;
@@ -814,7 +817,7 @@
* FIXME: To be fixed.
*
*/
-int
+Evas_Bool
evas_object_repeat_events_get(Evas_Object *obj)
{
MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_focus.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- evas_focus.c 5 Mar 2003 02:30:15 -0000 1.2
+++ evas_focus.c 18 Oct 2003 03:34:00 -0000 1.3
@@ -15,7 +15,7 @@
*
*/
void
-evas_object_focus_set(Evas_Object *obj, int focus)
+evas_object_focus_set(Evas_Object *obj, Evas_Bool focus)
{
MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
return;
@@ -45,7 +45,7 @@
* FIXME: To be fixed.
*
*/
-int
+Evas_Bool
evas_object_focus_get(Evas_Object *obj)
{
MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_key.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- evas_key.c 5 Mar 2003 02:30:15 -0000 1.5
+++ evas_key.c 18 Oct 2003 03:34:00 -0000 1.6
@@ -71,15 +71,17 @@
* FIXME: To be fixed.
*
*/
-int
+Evas_Bool
evas_key_modifier_is_set_get(Evas_Modifier *m, const char *keyname)
{
Evas_Modifier_Mask num;
+ int n;
if (!m) return 0;
if (!keyname) return 0;
- num = (Evas_Modifier_Mask)evas_key_modifier_number(m, keyname);
- if (num < 0) return 0;
+ n = evas_key_modifier_number(m, keyname);
+ if (n < 0) return 0;
+ num = (Evas_Modifier_Mask)n;
num = 1 << num;
if (m->mask & num) return 1;
return 0;
@@ -91,15 +93,17 @@
* FIXME: To be fixed.
*
*/
-int
+Evas_Bool
evas_key_lock_is_set_get(Evas_Lock *l, const char *keyname)
{
Evas_Modifier_Mask num;
+ int n;
if (!l) return 0;
if (!keyname) return 0;
- num = (Evas_Modifier_Mask)evas_key_lock_number(l, keyname);
- if (num < 0) return 0;
+ n = evas_key_lock_number(l, keyname);
+ if (n < 0) return 0;
+ num = (Evas_Modifier_Mask)n;
num = 1 << num;
if (l->mask & num) return 1;
return 0;
@@ -220,12 +224,14 @@
evas_key_modifier_on(Evas *e, const char *keyname)
{
Evas_Modifier_Mask num;
+ int n;
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return;
MAGIC_CHECK_END();
- num = (Evas_Modifier_Mask)evas_key_modifier_number(&(e->modifiers), keyname);
- if (num < 0) return;
+ n = (Evas_Modifier_Mask)evas_key_modifier_number(&(e->modifiers), keyname);
+ if (n < 0) return;
+ num = (Evas_Modifier_Mask)n;
num = 1 << num;
e->modifiers.mask |= num;
}
@@ -240,12 +246,14 @@
evas_key_modifier_off(Evas *e, const char *keyname)
{
Evas_Modifier_Mask num;
+ int n;
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return;
MAGIC_CHECK_END();
- num = (Evas_Modifier_Mask)evas_key_modifier_number(&(e->modifiers), keyname);
- if (num < 0) return;
+ n = evas_key_modifier_number(&(e->modifiers), keyname);
+ if (n < 0) return;
+ num = (Evas_Modifier_Mask)n;
num = 1 << num;
e->modifiers.mask &= ~num;
}
@@ -260,12 +268,14 @@
evas_key_lock_on(Evas *e, const char *keyname)
{
Evas_Modifier_Mask num;
+ int n;
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return;
MAGIC_CHECK_END();
- num = (Evas_Modifier_Mask)evas_key_lock_number(&(e->locks), keyname);
- if (num < 0) return;
+ n = evas_key_lock_number(&(e->locks), keyname);
+ if (n < 0) return;
+ num = (Evas_Modifier_Mask)n;
num = 1 << num;
e->locks.mask |= num;
}
@@ -280,12 +290,14 @@
evas_key_lock_off(Evas *e, const char *keyname)
{
Evas_Modifier_Mask num;
+ int n;
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return;
MAGIC_CHECK_END();
- num = (Evas_Modifier_Mask)evas_key_lock_number(&(e->locks), keyname);
- if (num < 0) return;
+ n = evas_key_lock_number(&(e->locks), keyname);
+ if (n < 0) return;
+ num = (Evas_Modifier_Mask)n;
num = 1 << num;
e->locks.mask &= ~num;
}
@@ -302,12 +314,14 @@
evas_key_modifier_mask_get(Evas *e, const char *keyname)
{
Evas_Modifier_Mask num;
+ int n;
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return 0;
MAGIC_CHECK_END();
if (!keyname) return 0;
- num = evas_key_modifier_number(&(e->modifiers), keyname);
- if (num < 0) return 0;
+ n = evas_key_modifier_number(&(e->modifiers), keyname);
+ if (n < 0) return 0;
+ num = (Evas_Modifier_Mask)n;
return 1 << num;
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_key_grab.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- evas_key_grab.c 17 Jul 2003 10:01:13 -0000 1.8
+++ evas_key_grab.c 18 Oct 2003 03:34:00 -0000 1.9
@@ -18,7 +18,7 @@
Evas_Key_Grab *g;
g = evas_mem_calloc(sizeof(Evas_Key_Grab));
- if (!g) return;
+ if (!g) return NULL;
g->object = obj;
g->modifiers = modifiers;
g->not_modifiers = not_modifiers;
@@ -147,8 +147,8 @@
* FIXME: To be fixed.
*
*/
-int
-evas_object_key_grab(Evas_Object *obj, const char *keyname, Evas_Modifier_Mask
modifiers, Evas_Modifier_Mask not_modifiers, int exclusive)
+Evas_Bool
+evas_object_key_grab(Evas_Object *obj, const char *keyname, Evas_Modifier_Mask
modifiers, Evas_Modifier_Mask not_modifiers, Evas_Bool exclusive)
{
/* MEM OK */
Evas_Key_Grab *g;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_main.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- evas_main.c 30 Jul 2003 02:58:10 -0000 1.7
+++ evas_main.c 18 Oct 2003 03:34:00 -0000 1.8
@@ -452,7 +452,7 @@
* @endcode
*/
void
-evas_output_viewport_set(Evas *e, double x, double y, double w, double h)
+evas_output_viewport_set(Evas *e, Evas_Coord x, Evas_Coord y, Evas_Coord w,
Evas_Coord h)
{
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return;
@@ -489,13 +489,13 @@
* Example:
* @code
* extern Evas *evas;
- * double x, y, width, height;
+ * Evas_Coord x, y, width, height;
*
* evas_output_viewport_get(evas, &x, &y, &w, &h);
* @endcode
*/
void
-evas_output_viewport_get(Evas *e, double *x, double *y, double *w, double *h)
+evas_output_viewport_get(Evas *e, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w,
Evas_Coord *h)
{
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
if (x) *x = 0;
@@ -527,18 +527,18 @@
* @code
* extern Evas *evas;
* extern int screen_x;
- * double canvas_x;
+ * Evas_Coord canvas_x;
*
* canvas_x = evas_coord_screen_x_to_world(evas, screen_x);
* @endcode
*/
-double
+Evas_Coord
evas_coord_screen_x_to_world(Evas *e, int x)
{
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return 0;
MAGIC_CHECK_END();
- return e->viewport.x + (((double)x * e->viewport.w) / (double)e->output.w);
+ return e->viewport.x + (((Evas_Coord)x * e->viewport.w) / (Evas_Coord)e->output.w);
}
/**
@@ -557,18 +557,18 @@
* @code
* extern Evas *evas;
* extern int screen_y;
- * double canvas_y;
+ * Evas_Coord canvas_y;
*
* canvas_y = evas_coord_screen_y_to_world(evas, screen_y);
* @endcode
*/
-double
+Evas_Coord
evas_coord_screen_y_to_world(Evas *e, int y)
{
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return 0;
MAGIC_CHECK_END();
- return e->viewport.y + (((double)y * e->viewport.h) / (double)e->output.h);
+ return e->viewport.y + (((Evas_Coord)y * e->viewport.h) / (Evas_Coord)e->output.h);
}
/**
@@ -587,18 +587,18 @@
* @code
* extern Evas *evas;
* int screen_x;
- * extern double canvas_x;
+ * extern Evas_Coord canvas_x;
*
* screen_x = evas_coord_world_x_to_screen(evas, canvas_x);
* @endcode
*/
int
-evas_coord_world_x_to_screen(Evas *e, double x)
+evas_coord_world_x_to_screen(Evas *e, Evas_Coord x)
{
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return 0;
MAGIC_CHECK_END();
- return (int)(((x - e->viewport.x) * (double)e->output.w) / e->viewport.w);
+ return (int)(((x - e->viewport.x) * (Evas_Coord)e->output.w) / e->viewport.w);
}
/**
@@ -617,18 +617,18 @@
* @code
* extern Evas *evas;
* int screen_y;
- * extern double canvas_y;
+ * extern Evas_Coord canvas_y;
*
* screen_y = evas_coord_world_y_to_screen(evas, canvas_y);
* @endcode
*/
int
-evas_coord_world_y_to_screen(Evas *e, double y)
+evas_coord_world_y_to_screen(Evas *e, Evas_Coord y)
{
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return 0;
MAGIC_CHECK_END();
- return (int)(((y - e->viewport.y) * (double)e->output.h) / e->viewport.h);
+ return (int)(((y - e->viewport.y) * (Evas_Coord)e->output.h) / e->viewport.h);
}
/**
@@ -837,25 +837,25 @@
* This function returns the current known pointer co-ordinates
*
* @param e The pointer to the Evas Canvas
- * @param x The pointer to a double to be filled in
- * @param y The pointer to a double to be filled in
+ * @param x The pointer to a Evas_Coord to be filled in
+ * @param y The pointer to a Evas_Coord to be filled in
*
* This function returns the current known canvas unit co-ordinates of the
- * mouse pointer and sets the contents of the doubles pointed to by @p x
+ * mouse pointer and sets the contents of the Evas_Coords pointed to by @p x
* and @p y to contain these co-ordinates. If @p e is not a valid canvas the
* results of this function are undefined.
*
* Example:
* @code
* extern Evas *evas;
- * double mouse_x, mouse_y;
+ * Evas_Coord mouse_x, mouse_y;
*
* evas_pointer_output_xy_get(evas, &mouse_x, &mouse_y);
* printf("Mouse is at canvas position %f, %f\n", mouse_x, mouse_y);
* @endcode
*/
void
-evas_pointer_canvas_xy_get(Evas *e, double *x, double *y)
+evas_pointer_canvas_xy_get(Evas *e, Evas_Coord *x, Evas_Coord *y)
{
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
if (x) *x = 0;
@@ -936,7 +936,7 @@
* else printf("Mouse is out\n");
* @endcode
*/
-int
+Evas_Bool
evas_pointer_inside_get(Evas *e)
{
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_object_gradient.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- evas_object_gradient.c 5 Mar 2003 02:30:17 -0000 1.3
+++ evas_object_gradient.c 18 Oct 2003 03:34:00 -0000 1.4
@@ -13,7 +13,7 @@
DATA32 magic;
struct {
- double angle;
+ Evas_Angle angle;
} cur, prev;
char changed : 1;
char gradient_changed : 1;
@@ -136,7 +136,7 @@
*
*/
void
-evas_object_gradient_angle_set(Evas_Object *obj, double angle)
+evas_object_gradient_angle_set(Evas_Object *obj, Evas_Angle angle)
{
Evas_Object_Gradient *o;
@@ -159,7 +159,7 @@
* FIXME: To be fixed.
*
*/
-double
+Evas_Angle
evas_object_gradient_angle_get(Evas_Object *obj)
{
Evas_Object_Gradient *o;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_object_image.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- evas_object_image.c 29 Jul 2003 01:42:20 -0000 1.10
+++ evas_object_image.c 18 Oct 2003 03:34:00 -0000 1.11
@@ -14,7 +14,7 @@
struct {
struct {
- double x, y, w, h;
+ Evas_Coord x, y, w, h;
} fill;
struct {
short w, h;
@@ -41,8 +41,8 @@
/* private methods for image objects */
static void evas_object_image_unload(Evas_Object *obj);
static void evas_object_image_load(Evas_Object *obj);
-static double evas_object_image_figure_x_fill(Evas_Object *obj, double start, double
size, double *size_ret);
-static double evas_object_image_figure_y_fill(Evas_Object *obj, double start, double
size, double *size_ret);
+static Evas_Coord evas_object_image_figure_x_fill(Evas_Object *obj, Evas_Coord start,
Evas_Coord size, Evas_Coord *size_ret);
+static Evas_Coord evas_object_image_figure_y_fill(Evas_Object *obj, Evas_Coord start,
Evas_Coord size, Evas_Coord *size_ret);
static void evas_object_image_init(Evas_Object *obj);
static void *evas_object_image_new(void);
@@ -256,7 +256,7 @@
*
*/
void
-evas_object_image_fill_set(Evas_Object *obj, double x, double y, double w, double h)
+evas_object_image_fill_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord
w, Evas_Coord h)
{
Evas_Object_Image *o;
@@ -290,7 +290,7 @@
*
*/
void
-evas_object_image_fill_get(Evas_Object *obj, double *x, double *y, double *w, double
*h)
+evas_object_image_fill_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord
*w, Evas_Coord *h)
{
Evas_Object_Image *o;
@@ -411,7 +411,7 @@
*
*/
void
-evas_object_image_data_set(Evas_Object *obj, int *data)
+evas_object_image_data_set(Evas_Object *obj, void *data)
{
Evas_Object_Image *o;
void *p_data;
@@ -447,8 +447,8 @@
* FIXME: To be fixed.
*
*/
-int *
-evas_object_image_data_get(Evas_Object *obj, int for_writing)
+void *
+evas_object_image_data_get(Evas_Object *obj, Evas_Bool for_writing)
{
Evas_Object_Image *o;
DATA32 *data;
@@ -478,7 +478,7 @@
*
*/
void
-evas_object_image_data_copy_set(Evas_Object *obj, int *data)
+evas_object_image_data_copy_set(Evas_Object *obj, void *data)
{
Evas_Object_Image *o;
@@ -540,7 +540,7 @@
*
*/
void
-evas_object_image_alpha_set(Evas_Object *obj, int has_alpha)
+evas_object_image_alpha_set(Evas_Object *obj, Evas_Bool has_alpha)
{
Evas_Object_Image *o;
@@ -569,7 +569,7 @@
* FIXME: To be fixed.
*
*/
-int
+Evas_Bool
evas_object_image_alpha_get(Evas_Object *obj)
{
Evas_Object_Image *o;
@@ -591,7 +591,7 @@
*
*/
void
-evas_object_image_smooth_scale_set(Evas_Object *obj, int smooth_scale)
+evas_object_image_smooth_scale_set(Evas_Object *obj, Evas_Bool smooth_scale)
{
Evas_Object_Image *o;
@@ -615,7 +615,7 @@
* FIXME: To be fixed.
*
*/
-int
+Evas_Bool
evas_object_image_smooth_scale_get(Evas_Object *obj)
{
Evas_Object_Image *o;
@@ -827,13 +827,13 @@
}
}
-static double
-evas_object_image_figure_x_fill(Evas_Object *obj, double start, double size, double
*size_ret)
+static Evas_Coord
+evas_object_image_figure_x_fill(Evas_Object *obj, Evas_Coord start, Evas_Coord size,
Evas_Coord *size_ret)
{
- double w;
+ Evas_Coord w;
w = ((size * obj->layer->evas->output.w) /
- (double)obj->layer->evas->viewport.w);
+ (Evas_Coord)obj->layer->evas->viewport.w);
if (start > 0)
{
while (start - size > 0) start -= size;
@@ -843,18 +843,18 @@
while (start < 0) start += size;
}
start = ((start * obj->layer->evas->output.w) /
- (double)obj->layer->evas->viewport.w);
+ (Evas_Coord)obj->layer->evas->viewport.w);
*size_ret = w;
return start;
}
-static double
-evas_object_image_figure_y_fill(Evas_Object *obj, double start, double size, double
*size_ret)
+static Evas_Coord
+evas_object_image_figure_y_fill(Evas_Object *obj, Evas_Coord start, Evas_Coord size,
Evas_Coord *size_ret)
{
- double h;
+ Evas_Coord h;
h = ((size * obj->layer->evas->output.h) /
- (double)obj->layer->evas->viewport.h);
+ (Evas_Coord)obj->layer->evas->viewport.h);
if (start > 0)
{
while (start - size > 0) start -= size;
@@ -864,7 +864,7 @@
while (start < 0) start += size;
}
start = ((start * obj->layer->evas->output.h) /
- (double)obj->layer->evas->viewport.h);
+ (Evas_Coord)obj->layer->evas->viewport.h);
*size_ret = h;
return start;
}
@@ -962,7 +962,7 @@
obj->cur.cache.clip.a);
if (o->engine_data)
{
- double idw, idh, idx, idy;
+ Evas_Coord idw, idh, idx, idy;
int ix, iy, iw, ih;
idx = evas_object_image_figure_x_fill(obj, o->cur.fill.x, o->cur.fill.w, &idw);
@@ -973,7 +973,7 @@
if (idy > 0.0) idy -= idh;
while ((int)idx < obj->cur.cache.geometry.w)
{
- double ydy;
+ Evas_Coord ydy;
int dobreak_w = 0;
ydy = idy;
@@ -1247,7 +1247,7 @@
while (o->pixel_updates)
{
Evas_Rectangle *r, *rr;
- double idw, idh, idx, idy;
+ Evas_Coord idw, idh, idx, idy;
int x, y, w, h;
rr = o->pixel_updates->data;
@@ -1255,13 +1255,13 @@
idx = evas_object_image_figure_x_fill(obj, o->cur.fill.x,
o->cur.fill.w, &idw);
idy = evas_object_image_figure_y_fill(obj, o->cur.fill.y,
o->cur.fill.h, &idh);
- if (idw < 1.0) idw = 1.0;
- if (idh < 1.0) idh = 1.0;
+ if (idw < 1) idw = 1;
+ if (idh < 1) idh = 1;
if (idx > 0) idx -= idw;
if (idy > 0) idy -= idh;
while (idx < obj->cur.cache.geometry.w)
{
- double ydy;
+ Evas_Coord ydy;
ydy = idy;
x = idx;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_object_intercept.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- evas_object_intercept.c 5 Mar 2003 02:30:18 -0000 1.5
+++ evas_object_intercept.c 18 Oct 2003 03:34:00 -0000 1.6
@@ -76,7 +76,7 @@
}
int
-evas_object_intercept_call_move(Evas_Object *obj, double x, double y)
+evas_object_intercept_call_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
{
/* MEM OK */
int ret;
@@ -92,7 +92,7 @@
}
int
-evas_object_intercept_call_resize(Evas_Object *obj, double w, double h)
+evas_object_intercept_call_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
{
/* MEM OK */
int ret;
@@ -285,7 +285,7 @@
*
*/
void
-evas_object_intercept_move_callback_add(Evas_Object *obj, void (*func) (void *data,
Evas_Object *obj, double x, double y), const void *data)
+evas_object_intercept_move_callback_add(Evas_Object *obj, void (*func) (void *data,
Evas_Object *obj, Evas_Coord x, Evas_Coord y), const void *data)
{
/* MEM OK */
MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
@@ -305,7 +305,7 @@
*
*/
void *
-evas_object_intercept_move_callback_del(Evas_Object *obj, void (*func) (void *data,
Evas_Object *obj, double x, double y))
+evas_object_intercept_move_callback_del(Evas_Object *obj, void (*func) (void *data,
Evas_Object *obj, Evas_Coord x, Evas_Coord y))
{
/* MEM OK */
void *data;
@@ -313,6 +313,7 @@
MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
return NULL;
MAGIC_CHECK_END();
+ if (!func) return NULL;
if (!obj->interceptors) return NULL;
obj->interceptors->move.func = NULL;
data = obj->interceptors->move.data;
@@ -328,7 +329,7 @@
*
*/
void
-evas_object_intercept_resize_callback_add(Evas_Object *obj, void (*func) (void *data,
Evas_Object *obj, double w, double h), const void *data)
+evas_object_intercept_resize_callback_add(Evas_Object *obj, void (*func) (void *data,
Evas_Object *obj, Evas_Coord w, Evas_Coord h), const void *data)
{
/* MEM OK */
MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
@@ -348,7 +349,7 @@
*
*/
void *
-evas_object_intercept_resize_callback_del(Evas_Object *obj, void (*func) (void *data,
Evas_Object *obj, double w, double h))
+evas_object_intercept_resize_callback_del(Evas_Object *obj, void (*func) (void *data,
Evas_Object *obj, Evas_Coord w, Evas_Coord h))
{
/* MEM OK */
void *data;
@@ -356,6 +357,7 @@
MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
return NULL;
MAGIC_CHECK_END();
+ if (!func) return NULL;
if (!obj->interceptors) return NULL;
obj->interceptors->resize.func = NULL;
data = obj->interceptors->resize.data;
@@ -399,6 +401,7 @@
MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
return NULL;
MAGIC_CHECK_END();
+ if (!func) return NULL;
if (!obj->interceptors) return NULL;
obj->interceptors->raise.func = NULL;
data = obj->interceptors->raise.data;
@@ -442,6 +445,7 @@
MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
return NULL;
MAGIC_CHECK_END();
+ if (!func) return NULL;
if (!obj->interceptors) return NULL;
obj->interceptors->lower.func = NULL;
data = obj->interceptors->lower.data;
@@ -485,6 +489,7 @@
MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
return NULL;
MAGIC_CHECK_END();
+ if (!func) return NULL;
if (!obj->interceptors) return NULL;
obj->interceptors->stack_above.func = NULL;
data = obj->interceptors->stack_above.data;
@@ -528,6 +533,7 @@
MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
return NULL;
MAGIC_CHECK_END();
+ if (!func) return NULL;
if (!obj->interceptors) return NULL;
obj->interceptors->stack_below.func = NULL;
data = obj->interceptors->stack_below.data;
@@ -571,6 +577,7 @@
MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
return NULL;
MAGIC_CHECK_END();
+ if (!func) return NULL;
if (!obj->interceptors) return NULL;
obj->interceptors->layer_set.func = NULL;
data = obj->interceptors->layer_set.data;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_object_line.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- evas_object_line.c 22 Jul 2003 05:16:47 -0000 1.5
+++ evas_object_line.c 18 Oct 2003 03:34:00 -0000 1.6
@@ -15,10 +15,10 @@
struct {
int x1, y1, x2, y2;
struct {
- double w, h;
+ Evas_Coord w, h;
} object;
} cache;
- double x1, y1, x2, y2;
+ Evas_Coord x1, y1, x2, y2;
} cur, prev;
char changed : 1;
@@ -35,8 +35,8 @@
static int evas_object_line_is_opaque(Evas_Object *obj);
static int evas_object_line_was_opaque(Evas_Object *obj);
-static int evas_object_line_is_inside(Evas_Object *obj, double x, double y);
-static int evas_object_line_was_inside(Evas_Object *obj, double x, double y);
+static int evas_object_line_is_inside(Evas_Object *obj, Evas_Coord x, Evas_Coord y);
+static int evas_object_line_was_inside(Evas_Object *obj, Evas_Coord x, Evas_Coord y);
static void evas_object_line_coords_recalc(Evas_Object *obj);
static Evas_Object_Func object_func =
@@ -88,11 +88,12 @@
*
*/
void
-evas_object_line_xy_set(Evas_Object *obj, double x1, double y1, double x2, double y2)
+evas_object_line_xy_set(Evas_Object *obj, Evas_Coord x1, Evas_Coord y1, Evas_Coord
x2, Evas_Coord y2)
{
Evas_Object_Line *o;
- double min_x, max_x, min_y, max_y;
- int is, was;
+ Evas_Coord min_x, max_x, min_y, max_y;
+ int is, was = 0;
+
MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
return;
MAGIC_CHECK_END();
@@ -159,7 +160,7 @@
*
*/
void
-evas_object_line_xy_get(Evas_Object *obj, double *x1, double *y1, double *x2, double
*y2)
+evas_object_line_xy_get(Evas_Object *obj, Evas_Coord *x1, Evas_Coord *y1, Evas_Coord
*x2, Evas_Coord *y2)
{
Evas_Object_Line *o;
@@ -382,7 +383,7 @@
}
static int
-evas_object_line_is_inside(Evas_Object *obj, double x, double y)
+evas_object_line_is_inside(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
{
Evas_Object_Line *o;
@@ -396,7 +397,7 @@
}
static int
-evas_object_line_was_inside(Evas_Object *obj, double x, double y)
+evas_object_line_was_inside(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
{
Evas_Object_Line *o;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_object_main.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- evas_object_main.c 9 Oct 2003 03:05:17 -0000 1.16
+++ evas_object_main.c 18 Oct 2003 03:34:00 -0000 1.17
@@ -436,9 +436,9 @@
*
*/
void
-evas_object_move(Evas_Object *obj, double x, double y)
+evas_object_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
{
- int is, was;
+ int is, was = 0;
MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
return;
@@ -487,9 +487,9 @@
*
*/
void
-evas_object_resize(Evas_Object *obj, double w, double h)
+evas_object_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
{
- int is, was;
+ int is, was = 0;
MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
return;
@@ -538,7 +538,7 @@
*
*/
void
-evas_object_geometry_get(Evas_Object *obj, double *x, double *y, double *w, double *h)
+evas_object_geometry_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord
*w, Evas_Coord *h)
{
MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
if (x) *x = 0; if (y) *y = 0; if (w) *w = 0; if (h) *h = 0;
@@ -659,7 +659,7 @@
* FIXME: To be fixed.
*
*/
-int
+Evas_Bool
evas_object_visible_get(Evas_Object *obj)
{
MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
@@ -742,7 +742,7 @@
*
*/
Evas_Object *
-evas_object_top_at_xy_get(Evas *e, double x, double y, int
include_pass_events_objects, int include_hidden_objects)
+evas_object_top_at_xy_get(Evas *e, Evas_Coord x, Evas_Coord y, Evas_Bool
include_pass_events_objects, Evas_Bool include_hidden_objects)
{
Evas_Object_List *l;
int xx, yy;
@@ -793,7 +793,7 @@
*
*/
Evas_Object *
-evas_object_top_in_rectangle_get(Evas *e, double x, double y, double w, double h, int
include_pass_events_objects, int include_hidden_objects)
+evas_object_top_in_rectangle_get(Evas *e, Evas_Coord x, Evas_Coord y, Evas_Coord w,
Evas_Coord h, Evas_Bool include_pass_events_objects, Evas_Bool include_hidden_objects)
{
Evas_Object_List *l;
int xx, yy, ww, hh;
@@ -836,7 +836,7 @@
*
*/
Evas_List *
-evas_objects_at_xy_get(Evas *e, double x, double y, int include_pass_events_objects,
int include_hidden_objects)
+evas_objects_at_xy_get(Evas *e, Evas_Coord x, Evas_Coord y, Evas_Bool
include_pass_events_objects, Evas_Bool include_hidden_objects)
{
Evas_List *in = NULL;
Evas_Object_List *l;
@@ -876,7 +876,7 @@
*
*/
Evas_List *
-evas_objects_in_rectangle_get(Evas *e, double x, double y, double w, double h, int
include_pass_events_objects, int include_hidden_objects)
+evas_objects_in_rectangle_get(Evas *e, Evas_Coord x, Evas_Coord y, Evas_Coord w,
Evas_Coord h, Evas_Bool include_pass_events_objects, Evas_Bool include_hidden_objects)
{
Evas_List *in = NULL;
Evas_Object_List *l;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_object_polygon.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- evas_object_polygon.c 22 Jul 2003 05:16:47 -0000 1.5
+++ evas_object_polygon.c 18 Oct 2003 03:34:00 -0000 1.6
@@ -20,7 +20,7 @@
struct _Evas_Polygon_Point
{
- double x, y;
+ Evas_Coord x, y;
};
/* private methods for polygon objects */
@@ -33,8 +33,8 @@
static int evas_object_polygon_is_opaque(Evas_Object *obj);
static int evas_object_polygon_was_opaque(Evas_Object *obj);
-static int evas_object_polygon_is_inside(Evas_Object *obj, double x, double y);
-static int evas_object_polygon_was_inside(Evas_Object *obj, double x, double y);
+static int evas_object_polygon_is_inside(Evas_Object *obj, Evas_Coord x, Evas_Coord
y);
+static int evas_object_polygon_was_inside(Evas_Object *obj, Evas_Coord x, Evas_Coord
y);
static Evas_Object_Func object_func =
{
@@ -85,12 +85,12 @@
*
*/
void
-evas_object_polygon_point_add(Evas_Object *obj, double x, double y)
+evas_object_polygon_point_add(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
{
Evas_Object_Polygon *o;
Evas_Polygon_Point *p;
- double min_x, max_x, min_y, max_y;
- int is, was;
+ Evas_Coord min_x, max_x, min_y, max_y;
+ int is, was = 0;
MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
return;
@@ -406,7 +406,7 @@
}
static int
-evas_object_polygon_is_inside(Evas_Object *obj, double x, double y)
+evas_object_polygon_is_inside(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
{
Evas_Object_Polygon *o;
@@ -420,7 +420,7 @@
}
static int
-evas_object_polygon_was_inside(Evas_Object *obj, double x, double y)
+evas_object_polygon_was_inside(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
{
Evas_Object_Polygon *o;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_object_smart.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- evas_object_smart.c 9 Oct 2003 03:05:17 -0000 1.8
+++ evas_object_smart.c 18 Oct 2003 03:34:00 -0000 1.9
@@ -231,13 +231,13 @@
Evas_List *l;
MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
- return;
+ return NULL;
MAGIC_CHECK_END();
o = (Evas_Object_Smart *)(obj->object_data);
MAGIC_CHECK(o, Evas_Object_Smart, MAGIC_OBJ_SMART);
- return;
+ return NULL;
MAGIC_CHECK_END();
- if (!event) return;
+ if (!event) return NULL;
for (l = obj->smart.callbacks; l; l = l->next)
{
Evas_Smart_Callback *cb;
@@ -347,7 +347,7 @@
if (cb->event) free(cb->event);
free(cb);
}
- obj->smart.parent;
+ obj->smart.parent = NULL;
obj->smart.data = NULL;
obj->smart.smart = NULL;
if (s) evas_object_smart_unuse(s);
@@ -404,6 +404,9 @@
static void
evas_object_smart_render(Evas_Object *obj, void *output, void *context, void
*surface, int x, int y)
{
+ return;
+ obj = output = context = surface = NULL;
+ x = y = 0;
}
static void
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_object_text.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- evas_object_text.c 22 Jul 2003 05:16:47 -0000 1.17
+++ evas_object_text.c 18 Oct 2003 03:34:00 -0000 1.18
@@ -15,7 +15,7 @@
struct {
char *text;
char *font;
- double size;
+ Evas_Font_Size size;
} cur, prev;
char changed : 1;
@@ -245,7 +245,6 @@
{
char font_prop[14][256];
int i;
- int match;
/* skip comments */
if ((fdef[0] == '!') || (fdef[0] == '#')) continue;
@@ -482,10 +481,10 @@
*
*/
void
-evas_object_text_font_set(Evas_Object *obj, const char *font, double size)
+evas_object_text_font_set(Evas_Object *obj, const char *font, Evas_Font_Size size)
{
Evas_Object_Text *o;
- int is, was;
+ int is, was = 0;
int same_font = 0;
if (!font) return;
@@ -521,7 +520,7 @@
{
char *f_file;
- f_file = object_text_font_cache_find(l->data, font);
+ f_file = object_text_font_cache_find(l->data, (char *)font);
if (f_file)
{
o->engine_data =
obj->layer->evas->engine.func->font_load(obj->layer->evas->engine.data.output,
@@ -604,7 +603,7 @@
*
*/
void
-evas_object_text_font_get(Evas_Object *obj, char **font, double *size)
+evas_object_text_font_get(Evas_Object *obj, char **font, Evas_Font_Size *size)
{
Evas_Object_Text *o;
@@ -710,7 +709,7 @@
* FIXME: To be fixed.
*
*/
-double
+Evas_Coord
evas_object_text_ascent_get(Evas_Object *obj)
{
Evas_Object_Text *o;
@@ -731,7 +730,7 @@
* FIXME: To be fixed.
*
*/
-double
+Evas_Coord
evas_object_text_descent_get(Evas_Object *obj)
{
Evas_Object_Text *o;
@@ -752,7 +751,7 @@
* FIXME: To be fixed.
*
*/
-double
+Evas_Coord
evas_object_text_max_ascent_get(Evas_Object *obj)
{
Evas_Object_Text *o;
@@ -773,7 +772,7 @@
* FIXME: To be fixed.
*
*/
-double
+Evas_Coord
evas_object_text_max_descent_get(Evas_Object *obj)
{
Evas_Object_Text *o;
@@ -794,7 +793,7 @@
* FIXME: To be fixed.
*
*/
-double
+Evas_Coord
evas_object_text_inset_get(Evas_Object *obj)
{
Evas_Object_Text *o;
@@ -817,7 +816,7 @@
* FIXME: To be fixed.
*
*/
-double
+Evas_Coord
evas_object_text_horiz_advance_get(Evas_Object *obj)
{
Evas_Object_Text *o;
@@ -840,7 +839,7 @@
* FIXME: To be fixed.
*
*/
-double
+Evas_Coord
evas_object_text_vert_advance_get(Evas_Object *obj)
{
Evas_Object_Text *o;
@@ -864,7 +863,7 @@
*
*/
int
-evas_object_text_char_pos_get(Evas_Object *obj, int pos, double *cx, double *cy,
double *cw, double *ch)
+evas_object_text_char_pos_get(Evas_Object *obj, int pos, Evas_Coord *cx, Evas_Coord
*cy, Evas_Coord *cw, Evas_Coord *ch)
{
Evas_Object_Text *o;
int ret, x = 0, y = 0, w = 0, h = 0;
@@ -917,7 +916,7 @@
*
*/
int
-evas_object_text_char_coords_get(Evas_Object *obj, double x, double y, double *cx,
double *cy, double *cw, double *ch)
+evas_object_text_char_coords_get(Evas_Object *obj, Evas_Coord x, Evas_Coord y,
Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch)
{
Evas_Object_Text *o;
int ret, rx = 0, ry = 0, rw = 0, rh = 0;
@@ -1101,7 +1100,7 @@
if (!str) return 0;
if (pos < 0) return 0;
p = pos;
- d = evas_common_font_utf8_get_next(str, &p);
+ d = evas_common_font_utf8_get_next((char *)str, &p);
if (decoded) *decoded = d;
return p;
}
@@ -1121,7 +1120,7 @@
if (!str) return 0;
if (pos < 0) return 0;
p = pos;
- d = evas_common_font_utf8_get_prev(str, &p);
+ d = evas_common_font_utf8_get_prev((char *)str, &p);
if (decoded) *decoded = d;
return p;
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_smart.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- evas_smart.c 9 Oct 2003 03:05:17 -0000 1.4
+++ evas_smart.c 18 Oct 2003 03:34:00 -0000 1.5
@@ -19,8 +19,8 @@
void (*func_lower) (Evas_Object *o),
void (*func_stack_above) (Evas_Object *o, Evas_Object *above),
void (*func_stack_below) (Evas_Object *o, Evas_Object *below),
- void (*func_move) (Evas_Object *o, double x, double y),
- void (*func_resize) (Evas_Object *o, double w, double h),
+ void (*func_move) (Evas_Object *o, Evas_Coord x, Evas_Coord y),
+ void (*func_resize) (Evas_Object *o, Evas_Coord w, Evas_Coord h),
void (*func_show) (Evas_Object *o),
void (*func_hide) (Evas_Object *o),
void (*func_color_set) (Evas_Object *o, int r, int g, int b, int
a),
@@ -133,7 +133,7 @@
MAGIC_CHECK(s, Evas_Smart, MAGIC_SMART);
return NULL;
MAGIC_CHECK_END();
- return s->smart_class->data;
+ return (void *)s->smart_class->data;
}
/* internal funcs */
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_stack.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- evas_stack.c 9 Oct 2003 03:05:17 -0000 1.6
+++ evas_stack.c 18 Oct 2003 03:34:00 -0000 1.7
@@ -290,7 +290,7 @@
Evas_Object *
evas_object_bottom_get(Evas *e)
{
- Evas_Object *obj2;
+ Evas_Object *obj2 = NULL;
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return NULL;
@@ -311,7 +311,7 @@
Evas_Object *
evas_object_top_get(Evas *e)
{
- Evas_Object *obj2;
+ Evas_Object *obj2 = NULL;
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return NULL;
-------------------------------------------------------
This SF.net email sponsored by: Enterprise Linux Forum Conference & Expo
The Event For Linux Datacenter Solutions & Strategies in The Enterprise
Linux in the Boardroom; in the Front Office; & in the Server Room
http://www.enterpriselinuxforum.com
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
