* put all the verious objects (rect, image, text...) in a single macro category

SVN revision: 37384
This commit is contained in:
Davide Andreoli 2008-11-01 21:07:49 +00:00
parent f10451da1f
commit 6637117c95
10 changed files with 118 additions and 126 deletions

View File

@ -88,6 +88,12 @@ static const Evas_Object_Func object_func =
* The following example shows how
*/
/**
* @addtogroup Evas_Object_Gradient_Group
* @{
* @ingroup Evas_Object_Group
*/
/**
* Adds a gradient object to the given evas.
* @param e The given evas.
@ -132,7 +138,6 @@ evas_object_gradient_add(Evas *e)
* @param b Blue component of the given color.
* @param a Alpha component of the given color.
* @param delta Proportion of the gradient object that is this color.
* @ingroup Evas_Object_Gradient_Group
*/
EAPI void
evas_object_gradient_color_stop_add(Evas_Object *obj, int r, int g, int b, int a, int delta)
@ -166,7 +171,6 @@ evas_object_gradient_color_stop_add(Evas_Object *obj, int r, int g, int b, int a
* @param obj The given evas gradient object.
* @param a Alpha value.
* @param delta Proportion of the gradient object that is this alpha.
* @ingroup Evas_Object_Gradient_Group
*/
EAPI void
evas_object_gradient_alpha_stop_add(Evas_Object *obj, int a, int delta)
@ -191,7 +195,6 @@ evas_object_gradient_alpha_stop_add(Evas_Object *obj, int a, int delta)
/**
* Deletes all stops set for the given evas gradient object or any set data.
* @param obj The given evas gradient object.
* @ingroup Evas_Object_Gradient_Group
*/
EAPI void
evas_object_gradient_clear(Evas_Object *obj)
@ -224,7 +227,6 @@ evas_object_gradient_clear(Evas_Object *obj)
* @param data The color data to be set. Should be in argb32 pixel format.
* @param len The length of the data pointer - multiple of the pixel size.
* @param has_alpha A flag indicating if the data has alpha or not.
* @ingroup Evas_Object_Gradient_Group
*/
EAPI void
evas_object_gradient_color_data_set(Evas_Object *obj, void *data, int len, Evas_Bool has_alpha)
@ -256,7 +258,6 @@ evas_object_gradient_color_data_set(Evas_Object *obj, void *data, int len, Evas_
* @param obj The given evas gradient object.
* @param data The alpha data to be set, in a8 format.
* @param len The length of the data pointer - multiple of the pixel size.
* @ingroup Evas_Object_Gradient_Group
*/
EAPI void
evas_object_gradient_alpha_data_set(Evas_Object *obj, void *data, int len)
@ -297,7 +298,6 @@ evas_object_gradient_alpha_data_set(Evas_Object *obj, void *data, int len)
* @param y The Y coordinate for the top left corner of the rect.
* @param w The width of the rect.
* @param h The height of the rect.
* @ingroup Evas_Object_Gradient_Group
*/
EAPI void
evas_object_gradient_fill_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h)
@ -337,7 +337,6 @@ evas_object_gradient_fill_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas
* @param y Pointer to an Evas_Coord to store the Y coordinate in.
* @param w Pointer to an Evas_Coord to store the width in.
* @param h Pointer to an Evas_Coord to store the height in.
* @ingroup Evas_Object_Gradient_Group
*/
EAPI void
evas_object_gradient_fill_get(const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h)
@ -371,7 +370,6 @@ evas_object_gradient_fill_get(const Evas_Object *obj, Evas_Coord *x, Evas_Coord
* from vertical.
* @param obj The given evas gradient object.
* @param angle Angle in degrees. Can be negative.
* @ingroup Evas_Object_Gradient_Group
*/
EAPI void
evas_object_gradient_fill_angle_set(Evas_Object *obj, Evas_Angle angle)
@ -396,7 +394,6 @@ evas_object_gradient_fill_angle_set(Evas_Object *obj, Evas_Angle angle)
* clockwise from the vertical.
* @param obj The given evas gradient object.
* @return The current angle if successful. @c 0.0 otherwise.
* @ingroup Evas_Object_Gradient_Group
*/
EAPI Evas_Angle
evas_object_gradient_fill_angle_get(const Evas_Object *obj)
@ -419,7 +416,6 @@ evas_object_gradient_fill_angle_get(const Evas_Object *obj)
* @param spread One of EVAS_TEXTURE_REFLECT, EVAS_TEXTURE_REPEAT,
* EVAS_TEXTURE_RESTRICT, EVAS_TEXTURE_RESTRICT_REFLECT, EVAS_TEXTURE_RESTRICT_REPEAT,
* or EVAS_TEXTURE_PAD.
* @ingroup Evas_Object_Gradient_Group
*/
EAPI void
evas_object_gradient_fill_spread_set(Evas_Object *obj, int spread)
@ -443,7 +439,6 @@ evas_object_gradient_fill_spread_set(Evas_Object *obj, int spread)
* Retrieves the spread (tiling mode) for the given gradient object's fill.
* @param obj The given evas gradient object.
* @return The current spread mode of the gradient object.
* @ingroup Evas_Object_Gradient_Group
*/
EAPI int
evas_object_gradient_fill_spread_get(const Evas_Object *obj)
@ -466,7 +461,6 @@ evas_object_gradient_fill_spread_get(const Evas_Object *obj)
* Used mostly by 'linear' kinds of gradients.
* @param obj The given evas gradient object.
* @param angle Angle in degrees. Can be negative.
* @ingroup Evas_Object_Gradient_Group
*/
EAPI void
evas_object_gradient_angle_set(Evas_Object *obj, Evas_Angle angle)
@ -492,7 +486,6 @@ evas_object_gradient_angle_set(Evas_Object *obj, Evas_Angle angle)
* rel to its intrinsic orientation.
* @param obj The given evas gradient object.
* @return The current angle if successful. @c 0.0 otherwise.
* @ingroup Evas_Object_Gradient_Group
*/
EAPI Evas_Angle
evas_object_gradient_angle_get(const Evas_Object *obj)
@ -513,7 +506,6 @@ evas_object_gradient_angle_get(const Evas_Object *obj)
* Sets the offset of the given evas gradient object's spectrum.
* @param obj The given evas gradient object.
* @param offset Values can be negative.
* @ingroup Evas_Object_Gradient_Group
*/
EAPI void
evas_object_gradient_offset_set(Evas_Object *obj, float offset)
@ -537,7 +529,6 @@ evas_object_gradient_offset_set(Evas_Object *obj, float offset)
* Retrieves the spectrum's offset
* @param obj The given evas gradient object.
* @return The current gradient offset if successful. @c 0.0 otherwise.
* @ingroup Evas_Object_Gradient_Group
*/
EAPI float
evas_object_gradient_offset_get(const Evas_Object *obj)
@ -558,7 +549,6 @@ evas_object_gradient_offset_get(const Evas_Object *obj)
* Sets the direction of the given evas gradient object's spectrum.
* @param obj The given evas gradient object.
* @param direction Values are either 1 (the default) or -1.
* @ingroup Evas_Object_Gradient_Group
*/
EAPI void
evas_object_gradient_direction_set(Evas_Object *obj, int direction)
@ -583,7 +573,6 @@ evas_object_gradient_direction_set(Evas_Object *obj, int direction)
* Retrieves the evas gradient object's spectrum direction
* @param obj The given evas gradient object.
* @return The current gradient direction if successful. @c 1 otherwise.
* @ingroup Evas_Object_Gradient_Group
*/
EAPI int
evas_object_gradient_direction_get(const Evas_Object *obj)
@ -606,7 +595,6 @@ evas_object_gradient_direction_get(const Evas_Object *obj)
* @param name Name of the geometric type that the gradient is to be drawn as.
* @param params List of allowable params that the given gradient type allows.
* Can be NULL.
* @ingroup Evas_Object_Gradient_Group
*/
EAPI void
evas_object_gradient_type_set(Evas_Object *obj, const char *name, const char *params)
@ -680,7 +668,6 @@ evas_object_gradient_type_set(Evas_Object *obj, const char *name, const char *pa
* name in.
* @param params Pointer to a character pointer to store the pointer to the type
* params string in.
* @ingroup Evas_Object_Gradient_Group
*/
EAPI void
evas_object_gradient_type_get(const Evas_Object *obj, char **name, char **params)
@ -703,6 +690,11 @@ evas_object_gradient_type_get(const Evas_Object *obj, char **name, char **params
}
/**
* @}
*/
/*
these two functions don't really belong here as they can apply to other
objs as well, but for now..

View File

@ -19,6 +19,20 @@ struct _Evas_Object_Gradient2
};
/**
* @defgroup Evas_Object_Gradient2_Group Gradient2 Object Functions
*
* Functions that work on evas gradient2 objects.
*
*/
/**
* @addtogroup Evas_Object_Gradient2_Group
* @{
* @ingroup Evas_Object_Group
*/
/**
* Inserts a color stop to the given evas gradient object.
*
@ -32,7 +46,6 @@ struct _Evas_Object_Gradient2
* @param b Blue component of the given color.
* @param a Alpha component of the given color.
* @param pos The pos in [0,1] of this stop.
* @ingroup Evas_Object_Gradient_Group
*/
EAPI void
evas_object_gradient2_color_np_stop_insert(Evas_Object *obj, int r, int g, int b, int a, float pos)
@ -59,7 +72,6 @@ evas_object_gradient2_color_np_stop_insert(Evas_Object *obj, int r, int g, int b
/**
* Deletes all stops set for the given evas gradient object or any set data.
* @param obj The given evas gradient object.
* @ingroup Evas_Object_Gradient_Group
*/
EAPI void
evas_object_gradient2_clear(Evas_Object *obj)
@ -89,7 +101,6 @@ evas_object_gradient2_clear(Evas_Object *obj)
* @param obj The given evas gradient object.
* @param spread One of EVAS_TEXTURE_REFLECT, EVAS_TEXTURE_REPEAT,
* EVAS_TEXTURE_RESTRICT, or EVAS_TEXTURE_PAD.
* @ingroup Evas_Object_Gradient_Group
*/
EAPI void
evas_object_gradient2_fill_spread_set(Evas_Object *obj, int spread)
@ -113,7 +124,6 @@ evas_object_gradient2_fill_spread_set(Evas_Object *obj, int spread)
* Retrieves the spread (tiling mode) for the given gradient object's fill.
* @param obj The given evas gradient object.
* @return The current spread mode of the gradient object.
* @ingroup Evas_Object_Gradient_Group
*/
EAPI int
evas_object_gradient2_fill_spread_get(const Evas_Object *obj)
@ -210,5 +220,10 @@ evas_object_gradient2_fill_transform_get (const Evas_Object *obj, Evas_Transform
}
/**
* @}
*/
#include "evas_object_gradient2_linear.c"
#include "evas_object_gradient2_radial.c"

View File

@ -65,11 +65,16 @@ static const Evas_Object_Func object_func =
/* the actual api call to add a gradient */
/**
* @addtogroup Evas_Object_Gradient2_Group
* @{
* @ingroup Evas_Object_Group
*/
/**
* Adds a gradient object to the given evas.
* @param e The given evas.
* @return A new evas gradient object if successful. Otherwise, @c NULL.
* @ingroup Evas_Object_Gradient_Group
*/
EAPI Evas_Object *
evas_object_gradient2_linear_add(Evas *e)
@ -107,7 +112,6 @@ evas_object_gradient2_linear_add(Evas *e)
* @param y0 The Y coordinate of the start point.
* @param x1 The X coordinate of the end point.
* @param y1 The Y coordinate of the end point
* @ingroup Evas_Object_Gradient_Group
*/
EAPI void
evas_object_gradient2_linear_fill_set(Evas_Object *obj, float x0, float y0, float x1, float y1)
@ -160,7 +164,9 @@ evas_object_gradient2_linear_fill_get(const Evas_Object *obj, float *x0, float *
return;
}
/**
* @}
*/
/* all nice and private */
static void

View File

@ -65,11 +65,16 @@ static const Evas_Object_Func rg_object_func =
/* the actual api call to add a gradient */
/**
* @addtogroup Evas_Object_Gradient2_Group
* @{
* @ingroup Evas_Object_Group
*/
/**
* Adds a gradient object to the given evas.
* @param e The given evas.
* @return A new evas gradient object if successful. Otherwise, @c NULL.
* @ingroup Evas_Object_Gradient_Group
*/
EAPI Evas_Object *
evas_object_gradient2_radial_add(Evas *e)
@ -106,7 +111,6 @@ evas_object_gradient2_radial_add(Evas *e)
* @param cy The Y coordinate of the start point.
* @param rx The length of the x-cordinate radius.
* @param ry The length of the y-coordinate radius.
* @ingroup Evas_Object_Gradient_Group
*/
EAPI void
evas_object_gradient2_radial_fill_set(Evas_Object *obj, float cx, float cy, float rx, float ry)
@ -159,7 +163,9 @@ evas_object_gradient2_radial_fill_get(const Evas_Object *obj, float *cx, float *
return;
}
/**
* @}
*/
/* all nice and private */
static void

View File

@ -180,12 +180,17 @@ static const Evas_Object_Func object_func =
* R = (r * a) / 32; G = (g * a) / 32; B = (b * a) / 32;
*/
/**
* @addtogroup Evas_Object_Image
* @{
* @ingroup Evas_Object_Group
*/
/**
* Creates a new image object on the given evas.
*
* @param e The given evas.
* @return The created image object.
* @ingroup Evas_Object_Image
*/
EAPI Evas_Object *
evas_object_image_add(Evas *e)
@ -215,7 +220,6 @@ evas_object_image_add(Evas *e)
* @param obj The given image object.
* @param file The image filename.
* @param key The image key in file, or NULL.
* @ingroup Evas_Object_Image
*/
EAPI void
evas_object_image_file_set(Evas_Object *obj, const char *file, const char *key)
@ -297,7 +301,6 @@ evas_object_image_file_set(Evas_Object *obj, const char *file, const char *key)
* @param obj The given image object.
* @param file Location to store the image filename, or NULL.
* @param key Location to store the image key, or NULL.
* @ingroup Evas_Object_Image
*/
EAPI void
evas_object_image_file_get(const Evas_Object *obj, const char **file, const char **key)
@ -336,7 +339,6 @@ evas_object_image_file_get(const Evas_Object *obj, const char **file, const char
* @param r Distance of the right border that is not to be stretched.
* @param t Distance of the top border that is not to be stretched.
* @param b Distance of the bottom border that is not to be stretched.
* @ingroup Evas_Object_Image
*/
EAPI void
evas_object_image_border_set(Evas_Object *obj, int l, int r, int t, int b)
@ -377,7 +379,6 @@ evas_object_image_border_set(Evas_Object *obj, int l, int r, int t, int b)
* @param r Location to store the right border width in, or NULL.
* @param t Location to store the top border width in, or NULL.
* @param b Location to store the bottom border width in, or NULL.
* @ingroup Evas_Object_Image
*/
EAPI void
evas_object_image_border_get(const Evas_Object *obj, int *l, int *r, int *t, int *b)
@ -416,7 +417,6 @@ evas_object_image_border_get(const Evas_Object *obj, int *l, int *r, int *t, int
*
* @param obj The given image object.
* @param fill Whether the center should be drawn.
* @ingroup Evas_Object_Image
*/
EAPI void
evas_object_image_border_center_fill_set(Evas_Object *obj, Evas_Bool fill)
@ -446,7 +446,6 @@ evas_object_image_border_center_fill_set(Evas_Object *obj, Evas_Bool fill)
*
* @param obj The given image object.
* @return If the center is to be drawn or not.
* @ingroup Evas_Object_Image
*/
EAPI Evas_Bool
evas_object_image_border_center_fill_get(const Evas_Object *obj)
@ -480,7 +479,6 @@ evas_object_image_border_center_fill_get(const Evas_Object *obj)
* @param y The Y coordinate for the top left corner of the image.
* @param w The width of the image.
* @param h The height of the image.
* @ingroup Evas_Object_Image
*/
EAPI void
evas_object_image_fill_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h)
@ -521,7 +519,6 @@ evas_object_image_fill_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Co
* @param y Location to store the Y coordinate for the top left corner of the image in, or NULL.
* @param w Location to store the width of the image in, or NULL.
* @param h Location to store the height of the image in, or NULL.
* @ingroup Evas_Object_Image
*/
EAPI void
evas_object_image_fill_get(const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h)
@ -555,7 +552,6 @@ evas_object_image_fill_get(const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y,
* @param obj The given evas image object.
* @param spread One of EVAS_TEXTURE_REFLECT, EVAS_TEXTURE_REPEAT,
* EVAS_TEXTURE_RESTRICT, or EVAS_TEXTURE_PAD.
* @ingroup Evas_Object_Image
*/
EAPI void
evas_object_image_fill_spread_set(Evas_Object *obj, int spread)
@ -579,7 +575,6 @@ evas_object_image_fill_spread_set(Evas_Object *obj, int spread)
* Retrieves the spread (tiling mode) for the given image object's fill.
* @param obj The given evas image object.
* @return The current spread mode of the image object.
* @ingroup Evas_Object_Image
*/
EAPI int
evas_object_image_fill_spread_get(const Evas_Object *obj)
@ -687,7 +682,6 @@ evas_object_image_fill_transform_get (const Evas_Object *obj, Evas_Transform *t)
* @param obj The given image object.
* @param w The new width of the image.
* @param h The new height of the image.
* @ingroup Evas_Object_Image
*/
EAPI void
evas_object_image_size_set(Evas_Object *obj, int w, int h)
@ -745,7 +739,6 @@ evas_object_image_size_set(Evas_Object *obj, int w, int h)
* @param obj The given image object.
* @param w Location to store the width of the image in, or NULL.
* @param h Location to store the height of the image in, or NULL.
* @ingroup Evas_Object_Image
*/
EAPI void
evas_object_image_size_get(const Evas_Object *obj, int *w, int *h)
@ -775,7 +768,6 @@ evas_object_image_size_get(const Evas_Object *obj, int *w, int *h)
*
* @param obj The given image object.
* @return The stride of the image.
* @ingroup Evas_Object_Image
*/
EAPI int
evas_object_image_stride_get(const Evas_Object *obj)
@ -800,7 +792,6 @@ evas_object_image_stride_get(const Evas_Object *obj)
* @return A value giving the last error that occurred. It should be one of
* the @c EVAS_LOAD_ERROR_* values. @c EVAS_LOAD_ERROR_NONE is
* returned if there was no error.
* @ingroup Evas_Object_Image
*/
EAPI int
evas_object_image_load_error_get(const Evas_Object *obj)
@ -832,7 +823,6 @@ evas_object_image_load_error_get(const Evas_Object *obj)
* @param obj The given image object.
* @param to_cspace The colorspace to which the image raw data will be converted.
* @return data A newly allocated data in the format specified by to_cspace.
* @ingroup Evas_Object_Image
*/
EAPI void *
evas_object_image_data_convert(Evas_Object *obj, Evas_Colorspace to_cspace)
@ -865,7 +855,6 @@ evas_object_image_data_convert(Evas_Object *obj, Evas_Colorspace to_cspace)
*
* @param obj The given image object.
* @param data The raw data, or NULL.
* @ingroup Evas_Object_Image
*/
EAPI void
evas_object_image_data_set(Evas_Object *obj, void *data)
@ -935,7 +924,6 @@ evas_object_image_data_set(Evas_Object *obj, void *data)
* @param obj The given image object.
* @param for_writing Whether the data being retrieved will be modified.
* @return The raw image data.
* @ingroup Evas_Object_Image
*/
EAPI void *
evas_object_image_data_get(const Evas_Object *obj, Evas_Bool for_writing)
@ -975,7 +963,6 @@ evas_object_image_data_get(const Evas_Object *obj, Evas_Bool for_writing)
*
* @param obj The given image object.
* @param cancel 0 means add to the workqueue, 1 remove it.
* @ingroup Evas_Object_Image
*/
EAPI void
evas_object_image_preload(const Evas_Object *obj, Evas_Bool cancel)
@ -1020,7 +1007,6 @@ evas_object_image_preload(const Evas_Object *obj, Evas_Bool cancel)
*
* @param obj The given image object.
* @param data The raw data.
* @ingroup Evas_Object_Image
*/
EAPI void
evas_object_image_data_copy_set(Evas_Object *obj, void *data)
@ -1065,7 +1051,6 @@ evas_object_image_data_copy_set(Evas_Object *obj, void *data)
* @param y Y-offset of the region to be updated.
* @param w Width of the region to be updated.
* @param h Height of the region to be updated.
* @ingroup Evas_Object_Image
*/
EAPI void
evas_object_image_data_update_add(Evas_Object *obj, int x, int y, int w, int h)
@ -1099,7 +1084,6 @@ evas_object_image_data_update_add(Evas_Object *obj, int x, int y, int w, int h)
*
* @param obj The given image object.
* @param has_alpha Whether to use alpha channel data or not.
* @ingroup Evas_Object_Image
*/
EAPI void
evas_object_image_alpha_set(Evas_Object *obj, Evas_Bool has_alpha)
@ -1136,7 +1120,6 @@ evas_object_image_alpha_set(Evas_Object *obj, Evas_Bool has_alpha)
*
* @param obj The given image object.
* @return Whether the alpha channel data is being used.
* @ingroup Evas_Object_Image
*/
EAPI Evas_Bool
evas_object_image_alpha_get(const Evas_Object *obj)
@ -1163,7 +1146,6 @@ evas_object_image_alpha_get(const Evas_Object *obj)
*
* @param obj The given image object.
* @param smooth_scale Whether to use smooth scale or not.
* @ingroup Evas_Object_Image
*/
EAPI void
evas_object_image_smooth_scale_set(Evas_Object *obj, Evas_Bool smooth_scale)
@ -1191,7 +1173,6 @@ evas_object_image_smooth_scale_set(Evas_Object *obj, Evas_Bool smooth_scale)
*
* @param obj The given image object.
* @return Whether smooth scale is being used.
* @ingroup Evas_Object_Image
*/
EAPI Evas_Bool
evas_object_image_smooth_scale_get(const Evas_Object *obj)
@ -1252,7 +1233,6 @@ evas_object_image_reload(Evas_Object *obj)
* @param file The filename to be used to save the image.
* @param key The image key in file, or NULL.
* @param flags String containing the flags to be used.
* @ingroup Evas_Object_Image
*/
EAPI Evas_Bool
evas_object_image_save(const Evas_Object *obj, const char *file, const char *key, const char *flags)
@ -1439,7 +1419,6 @@ evas_object_image_pixels_get_callback_set(Evas_Object *obj, void (*func) (void *
*
* @param obj The given image object.
* @param dirty Whether the image is dirty.
* @ingroup Evas_Object_Image
*/
EAPI void
evas_object_image_pixels_dirty_set(Evas_Object *obj, Evas_Bool dirty)
@ -1464,7 +1443,6 @@ evas_object_image_pixels_dirty_set(Evas_Object *obj, Evas_Bool dirty)
*
* @param obj The given image object.
* @return Whether the image is dirty.
* @ingroup Evas_Object_Image
*/
EAPI Evas_Bool
evas_object_image_pixels_dirty_get(const Evas_Object *obj)
@ -1817,6 +1795,10 @@ evas_image_cache_get(const Evas *e)
return e->engine.func->image_cache_get(e->engine.data.output);
}
/**
* @}
*/
/* all nice and private */
static void

View File

@ -74,11 +74,16 @@ static const Evas_Object_Func object_func =
* Functions used to deal with evas line objects.
*/
/**
* @addtogroup Evas_Line_Group
* @{
* @ingroup Evas_Object_Group
*/
/**
* Adds a new evas line object to the given evas.
* @param e The given evas.
* @return The new evas line object.
* @ingroup Evas_Line_Group
*/
EAPI Evas_Object *
evas_object_line_add(Evas *e)
@ -101,7 +106,6 @@ evas_object_line_add(Evas *e)
* @param y1 The Y coordinate of the first point.
* @param x2 The X coordinate of the second point.
* @param y2 The Y coordinate of the second point.
* @ingroup Evas_Line_Group
*/
EAPI void
evas_object_line_xy_set(Evas_Object *obj, Evas_Coord x1, Evas_Coord y1, Evas_Coord x2, Evas_Coord y2)
@ -188,7 +192,6 @@ evas_object_line_xy_set(Evas_Object *obj, Evas_Coord x1, Evas_Coord y1, Evas_Coo
* second end point.
* @param y2 Pointer to an integer in which to store the Y coordinate of the
* second end point.
* @ingroup Evas_Line_Group
*/
EAPI void
evas_object_line_xy_get(const Evas_Object *obj, Evas_Coord *x1, Evas_Coord *y1, Evas_Coord *x2, Evas_Coord *y2)
@ -216,7 +219,9 @@ evas_object_line_xy_get(const Evas_Object *obj, Evas_Coord *x1, Evas_Coord *y1,
if (y2) *y2 = obj->cur.geometry.y + o->cur.y2;
}
/**
* @}
*/
/* all nice and private */
static void

View File

@ -66,16 +66,21 @@ static const Evas_Object_Func object_func =
/* it has no other api calls as all properties are standard */
/**
* @defgroup Evas_Polygon_Group Polygon Object Functions
* @defgroup Evas_Object_Polygon Polygon Object Functions
*
* Functions that operate on evas polygon objects.
*/
/**
* @addtogroup Evas_Object_Polygon
* @{
* @ingroup Evas_Object_Group
*/
/**
* Adds a new evas polygon object to the given evas.
* @param e The given evas.
* @return A new evas polygon object.
* @ingroup Evas_Polygon_Group
*/
EAPI Evas_Object *
evas_object_polygon_add(Evas *e)
@ -175,7 +180,6 @@ evas_object_polygon_point_add(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
/**
* Removes all of the points from the given evas polygon object.
* @param obj The given polygon object.
* @ingroup Evas_Polygon_Group
*/
EAPI void
evas_object_polygon_points_clear(Evas_Object *obj)
@ -217,9 +221,9 @@ evas_object_polygon_points_clear(Evas_Object *obj)
evas_object_inform_call_resize(obj);
}
/**
* @}
*/
/* all nice and private */
static void

View File

@ -62,11 +62,22 @@ static const Evas_Object_Func object_func =
/* the actual api call to add a rect */
/* it has no other api calls as all properties are standard */
/**
* @defgroup Evas_Object_Rectangle Rectangle Object Functions
*
* Functions that operate on evas rectangle objects.
*/
/**
* @addtogroup Evas_Object_Rectangle
* @{
* @ingroup Evas_Object_Group
*/
/**
* Adds a rectangle to the given evas.
* @param e The given evas.
* @return The new rectangle object.
* @todo Find a documentation group to put this under.
*/
EAPI Evas_Object *
evas_object_rectangle_add(Evas *e)
@ -82,10 +93,9 @@ evas_object_rectangle_add(Evas *e)
return obj;
}
/**
* @}
*/
/* all nice and private */
static void

View File

@ -75,6 +75,18 @@ static const Evas_Object_Func object_func =
/* the actual api call to add a rect */
/* it has no other api calls as all properties are standard */
/**
* @defgroup Evas_Object_Text Text Object Functions
*
* Functions that operate on evas text objects.
*/
/**
* @addtogroup Evas_Object_Text
* @{
* @ingroup Evas_Object_Group
*/
/**
* Creates a new text @c Evas_Object on the provided @c Evas canvas.
*
@ -940,6 +952,10 @@ evas_object_text_style_pad_get(const Evas_Object *obj, int *l, int *r, int *t, i
}
/**
* @}
*/
/**
* @defgroup Evas_Font_Path_Group Font Path Functions
*

View File

@ -205,6 +205,12 @@ static const Evas_Object_Func object_func =
* Note: put here some usage examples
*/
/**
* @addtogroup Evas_Object_Textblock
* @{
* @ingroup Evas_Object_Group
*/
/* styles */
static void
_style_clear(Evas_Textblock_Style *ts)
@ -2317,7 +2323,6 @@ _find_layout_line_num(const Evas_Object *obj, int line)
* Adds a textblock to the given evas.
* @param e The given evas.
* @return The new textblock object.
* @ingroup Evas_Object_Textblock
*/
EAPI Evas_Object *
evas_object_textblock_add(Evas *e)
@ -2336,7 +2341,6 @@ evas_object_textblock_add(Evas *e)
/**
* Creates a new textblock style.
* @return The new textblock style.
* @ingroup Evas_Object_Textblock
*/
EAPI Evas_Textblock_Style *
evas_textblock_style_new(void)
@ -2351,7 +2355,6 @@ evas_textblock_style_new(void)
* Destroys a textblock style.
* @param The textblock style to free.
* @return Returns no value.
* @ingroup Evas_Object_Textblock
*/
EAPI void
evas_textblock_style_free(Evas_Textblock_Style *ts)
@ -2371,7 +2374,6 @@ evas_textblock_style_free(Evas_Textblock_Style *ts)
* @param ts to be documented.
* @param text to be documented.
* @return Returns no value.
* @ingroup Evas_Object_Textblock
*/
EAPI void
evas_textblock_style_set(Evas_Textblock_Style *ts, const char *text)
@ -2504,7 +2506,6 @@ evas_textblock_style_set(Evas_Textblock_Style *ts, const char *text)
* to be documented.
* @param ts to be documented.
* @return to be documented.
* @ingroup Evas_Object_Textblock
*/
EAPI const char *
evas_textblock_style_get(const Evas_Textblock_Style *ts)
@ -2519,7 +2520,6 @@ evas_textblock_style_get(const Evas_Textblock_Style *ts)
* @param obj to be documented.
* @param ts to be documented.
* @return Returns no value.
* @ingroup Evas_Object_Textblock
*/
EAPI void
evas_object_textblock_style_set(Evas_Object *obj, Evas_Textblock_Style *ts)
@ -2559,7 +2559,6 @@ evas_object_textblock_style_set(Evas_Object *obj, Evas_Textblock_Style *ts)
* to be documented.
* @param obj to be documented.
* @return to be documented.
* @ingroup Evas_Object_Textblock
*/
EAPI const Evas_Textblock_Style *
evas_object_textblock_style_get(const Evas_Object *obj)
@ -2572,7 +2571,6 @@ evas_object_textblock_style_get(const Evas_Object *obj)
* to be documented.
* @param obj to be documented.
* @return to be documented.
* @ingroup Evas_Object_Textblock
*/
EAPI void
evas_object_textblock_replace_char_set(Evas_Object *obj, const char *ch)
@ -2596,7 +2594,6 @@ evas_object_textblock_replace_char_set(Evas_Object *obj, const char *ch)
* to be documented.
* @param obj to be documented.
* @return to be documented.
* @ingroup Evas_Object_Textblock
*/
EAPI const char *
evas_object_textblock_replace_char_get(Evas_Object *obj)
@ -2689,7 +2686,6 @@ _escaped_char_get(const char *s, const char *s_end)
* to be documented.
* @param obj to be documented.
* @return to be documented.
* @ingroup Evas_Object_Textblock
*/
EAPI const char *
evas_textblock_escape_string_get(const char *escape)
@ -2702,7 +2698,6 @@ evas_textblock_escape_string_get(const char *escape)
* to be documented.
* @param obj to be documented.
* @return to be documented.
* @ingroup Evas_Object_Textblock
*/
EAPI const char *
evas_textblock_string_escape_get(const char *string, int *len_ret)
@ -2738,7 +2733,6 @@ _prepend_escaped_char(Evas_Textblock_Cursor *cur, const char *s,
* @param ts to be documented.
* @param text to be documented.
* @return Return no value.
* @ingroup Evas_Object_Textblock
*/
EAPI void
evas_object_textblock_text_markup_set(Evas_Object *obj, const char *text)
@ -2881,7 +2875,6 @@ evas_object_textblock_text_markup_set(Evas_Object *obj, const char *text)
* @param ts to be documented.
* @param text to be documented.
* @return Return no value.
* @ingroup Evas_Object_Textblock
*/
EAPI void
evas_object_textblock_text_markup_prepend(Evas_Textblock_Cursor *cur, const char *text)
@ -3010,7 +3003,6 @@ evas_object_textblock_text_markup_prepend(Evas_Textblock_Cursor *cur, const char
* to be documented.
* @param obj to be documented.
* @return to be documented.
* @ingroup Evas_Object_Textblock
*/
EAPI const char *
evas_object_textblock_text_markup_get(const Evas_Object *obj)
@ -3085,7 +3077,6 @@ evas_object_textblock_text_markup_get(const Evas_Object *obj)
* to be documented.
* @param obj to be documented.
* @return to be documented.
* @ingroup Evas_Object_Textblock
*/
EAPI const Evas_Textblock_Cursor *
evas_object_textblock_cursor_get(const Evas_Object *obj)
@ -3098,7 +3089,6 @@ evas_object_textblock_cursor_get(const Evas_Object *obj)
* to be documented.
* @param obj to be documented.
* @return to be documented.
* @ingroup Evas_Object_Textblock
*/
EAPI Evas_Textblock_Cursor *
evas_object_textblock_cursor_new(Evas_Object *obj)
@ -3118,7 +3108,6 @@ evas_object_textblock_cursor_new(Evas_Object *obj)
* to be documented.
* @param cur to be documented.
* @return Returns no value.
* @ingroup Evas_Object_Textblock
*/
EAPI void
evas_textblock_cursor_free(Evas_Textblock_Cursor *cur)
@ -3136,7 +3125,6 @@ evas_textblock_cursor_free(Evas_Textblock_Cursor *cur)
* to be documented.
* @param cur to be documented.
* @return Returns no value.
* @ingroup Evas_Object_Textblock
*/
EAPI void
evas_textblock_cursor_node_first(Evas_Textblock_Cursor *cur)
@ -3153,7 +3141,6 @@ evas_textblock_cursor_node_first(Evas_Textblock_Cursor *cur)
* to be documented.
* @param cur to be documented.
* @return Returns no value.
* @ingroup Evas_Object_Textblock
*/
EAPI void
evas_textblock_cursor_node_last(Evas_Textblock_Cursor *cur)
@ -3179,7 +3166,6 @@ evas_textblock_cursor_node_last(Evas_Textblock_Cursor *cur)
* to be documented.
* @param cur to be documented.
* @return to be documented.
* @ingroup Evas_Object_Textblock
*/
EAPI Evas_Bool
evas_textblock_cursor_node_next(Evas_Textblock_Cursor *cur)
@ -3202,7 +3188,6 @@ evas_textblock_cursor_node_next(Evas_Textblock_Cursor *cur)
* to be documented.
* @param cur to be documented.
* @return to be documented.
* @ingroup Evas_Object_Textblock
*/
EAPI Evas_Bool
evas_textblock_cursor_node_prev(Evas_Textblock_Cursor *cur)
@ -3225,7 +3210,6 @@ evas_textblock_cursor_node_prev(Evas_Textblock_Cursor *cur)
* to be documented.
* @param cur to be documented.
* @return to be documented.
* @ingroup Evas_Object_Textblock
*/
EAPI Evas_Bool
evas_textblock_cursor_char_next(Evas_Textblock_Cursor *cur)
@ -3251,7 +3235,6 @@ evas_textblock_cursor_char_next(Evas_Textblock_Cursor *cur)
* to be documented.
* @param cur to be documented.
* @return to be documented.
* @ingroup Evas_Object_Textblock
*/
EAPI Evas_Bool
evas_textblock_cursor_char_prev(Evas_Textblock_Cursor *cur)
@ -3276,7 +3259,6 @@ evas_textblock_cursor_char_prev(Evas_Textblock_Cursor *cur)
* to be documented.
* @param cur to be documented.
* @return Returns no value.
* @ingroup Evas_Object_Textblock
*/
EAPI void
evas_textblock_cursor_char_first(Evas_Textblock_Cursor *cur)
@ -3289,7 +3271,6 @@ evas_textblock_cursor_char_first(Evas_Textblock_Cursor *cur)
* to be documented.
* @param cur to be documented.
* @return Returns no value.
* @ingroup Evas_Object_Textblock
*/
EAPI void
evas_textblock_cursor_char_last(Evas_Textblock_Cursor *cur)
@ -3312,7 +3293,6 @@ evas_textblock_cursor_char_last(Evas_Textblock_Cursor *cur)
* to be documented.
* @param cur to be documented.
* @return Returns no value.
* @ingroup Evas_Object_Textblock
*/
EAPI void
evas_textblock_cursor_line_first(Evas_Textblock_Cursor *cur)
@ -3354,7 +3334,6 @@ evas_textblock_cursor_line_first(Evas_Textblock_Cursor *cur)
* to be documented.
* @param cur to be documented.
* @return Returns no value.
* @ingroup Evas_Object_Textblock
*/
EAPI void
evas_textblock_cursor_line_last(Evas_Textblock_Cursor *cur)
@ -3406,7 +3385,6 @@ evas_textblock_cursor_line_last(Evas_Textblock_Cursor *cur)
* to be documented.
* @param cur to be documented.
* @return to be documented.
* @ingroup Evas_Object_Textblock
*/
EAPI int
evas_textblock_cursor_pos_get(const Evas_Textblock_Cursor *cur)
@ -3420,7 +3398,6 @@ evas_textblock_cursor_pos_get(const Evas_Textblock_Cursor *cur)
* @param cur to be documented.
* @param int to be documented.
* @return Returns no value.
* @ingroup Evas_Object_Textblock
*/
EAPI void
evas_textblock_cursor_pos_set(Evas_Textblock_Cursor *cur, int pos)
@ -3438,7 +3415,6 @@ evas_textblock_cursor_pos_set(Evas_Textblock_Cursor *cur, int pos)
* @param cur to be documented.
* @param int to be documented.
* @return to be documented.
* @ingroup Evas_Object_Textblock
*/
EAPI Evas_Bool
evas_textblock_cursor_line_set(Evas_Textblock_Cursor *cur, int line)
@ -3479,7 +3455,6 @@ evas_textblock_cursor_line_set(Evas_Textblock_Cursor *cur, int line)
* @param cur1 to be documented.
* @param cur2 to be documented.
* @return to be documented.
* @ingroup Evas_Object_Textblock
*/
EAPI int
evas_textblock_cursor_compare(const Evas_Textblock_Cursor *cur1, const Evas_Textblock_Cursor *cur2)
@ -3514,7 +3489,6 @@ evas_textblock_cursor_compare(const Evas_Textblock_Cursor *cur1, const Evas_Text
* @param cur to be documented.
* @param cur_dest to be documented.
* @return Returns no value.
* @ingroup Evas_Object_Textblock
*/
EAPI void
evas_textblock_cursor_copy(const Evas_Textblock_Cursor *cur, Evas_Textblock_Cursor *cur_dest)
@ -3533,7 +3507,6 @@ evas_textblock_cursor_copy(const Evas_Textblock_Cursor *cur, Evas_Textblock_Curs
* @param cur to be documented.
* @param text to be documented.
* @return Returns no value.
* @ingroup Evas_Object_Textblock
*/
EAPI void
evas_textblock_cursor_text_append(Evas_Textblock_Cursor *cur, const char *text)
@ -3611,7 +3584,6 @@ evas_textblock_cursor_text_append(Evas_Textblock_Cursor *cur, const char *text)
* @param cur to be documented.
* @param text to be documented.
* @return Returns no value.
* @ingroup Evas_Object_Textblock
*/
EAPI void
evas_textblock_cursor_text_prepend(Evas_Textblock_Cursor *cur, const char *text)
@ -3687,7 +3659,6 @@ evas_textblock_cursor_text_prepend(Evas_Textblock_Cursor *cur, const char *text)
* @param cur to be documented.
* @param format to be documented.
* @return Returns no value.
* @ingroup Evas_Object_Textblock
*/
EAPI void
evas_textblock_cursor_format_append(Evas_Textblock_Cursor *cur, const char *format)
@ -3766,7 +3737,6 @@ evas_textblock_cursor_format_append(Evas_Textblock_Cursor *cur, const char *form
* @param cur to be documented.
* @param format to be documented.
* @return Returns no value.
* @ingroup Evas_Object_Textblock
*/
EAPI void
evas_textblock_cursor_format_prepend(Evas_Textblock_Cursor *cur, const char *format)
@ -3850,7 +3820,6 @@ evas_textblock_cursor_format_prepend(Evas_Textblock_Cursor *cur, const char *for
* to be documented.
* @param cur to be documented.
* @return Returns no value.
* @ingroup Evas_Object_Textblock
*/
EAPI void
evas_textblock_cursor_node_delete(Evas_Textblock_Cursor *cur)
@ -3923,7 +3892,6 @@ evas_textblock_cursor_node_delete(Evas_Textblock_Cursor *cur)
* to be documented.
* @param cur to be documented.
* @return Returns no value.
* @ingroup Evas_Object_Textblock
*/
EAPI void
evas_textblock_cursor_char_delete(Evas_Textblock_Cursor *cur)
@ -4006,7 +3974,6 @@ evas_textblock_cursor_char_delete(Evas_Textblock_Cursor *cur)
* @param cur1 to be documented.
* @param cur2 to be documented.
* @return Returns no value.
* @ingroup Evas_Object_Textblock
*/
EAPI void
evas_textblock_cursor_range_delete(Evas_Textblock_Cursor *cur1, Evas_Textblock_Cursor *cur2)
@ -4277,7 +4244,6 @@ evas_textblock_cursor_range_delete(Evas_Textblock_Cursor *cur1, Evas_Textblock_C
* to be documented.
* @param cur to be documented.
* @return to be documented.
* @ingroup Evas_Object_Textblock
*/
EAPI const char *
evas_textblock_cursor_node_text_get(const Evas_Textblock_Cursor *cur)
@ -4295,7 +4261,6 @@ evas_textblock_cursor_node_text_get(const Evas_Textblock_Cursor *cur)
* to be documented.
* @param cur to be documented.
* @return to be documented.
* @ingroup Evas_Object_Textblock
*/
EAPI int
evas_textblock_cursor_node_text_length_get(const Evas_Textblock_Cursor *cur)
@ -4313,7 +4278,6 @@ evas_textblock_cursor_node_text_length_get(const Evas_Textblock_Cursor *cur)
* to be documented.
* @param cur to be documented.
* @return to be documented.
* @ingroup Evas_Object_Textblock
*/
EAPI const char *
evas_textblock_cursor_node_format_get(const Evas_Textblock_Cursor *cur)
@ -4331,7 +4295,6 @@ evas_textblock_cursor_node_format_get(const Evas_Textblock_Cursor *cur)
* to be documented.
* @param cur to be documented.
* @return to be documented.
* @ingroup Evas_Object_Textblock
*/
EAPI Evas_Bool
evas_textblock_cursor_node_format_is_visible_get(const Evas_Textblock_Cursor *cur)
@ -4382,7 +4345,6 @@ evas_textblock_cursor_node_format_is_visible_get(const Evas_Textblock_Cursor *cu
* @param cur2 to be documented.
* @param format to be documented.
* @return to be documented.
* @ingroup Evas_Object_Textblock
*/
EAPI char *
evas_textblock_cursor_range_text_get(const Evas_Textblock_Cursor *cur1, const Evas_Textblock_Cursor *cur2, Evas_Textblock_Text_Type format)
@ -4538,7 +4500,6 @@ evas_textblock_cursor_range_text_get(const Evas_Textblock_Cursor *cur1, const Ev
* @param cw to be documented.
* @param ch to be documented.
* @return to be documented.
* @ingroup Evas_Object_Textblock
*/
EAPI int
evas_textblock_cursor_char_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch)
@ -4622,7 +4583,6 @@ evas_textblock_cursor_char_geometry_get(const Evas_Textblock_Cursor *cur, Evas_C
* @param cw to be documented.
* @param ch to be documented.
* @return to be documented.
* @ingroup Evas_Object_Textblock
*/
EAPI int
evas_textblock_cursor_line_geometry_get(const Evas_Textblock_Cursor *cur, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch)
@ -4659,7 +4619,6 @@ evas_textblock_cursor_line_geometry_get(const Evas_Textblock_Cursor *cur, Evas_C
* @param x to be documented.
* @param y to be documented.
* @return to be documented.
* @ingroup Evas_Object_Textblock
*/
EAPI Evas_Bool
evas_textblock_cursor_char_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord x, Evas_Coord y)
@ -4732,7 +4691,6 @@ evas_textblock_cursor_char_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord x, E
* @param cur to be documented.
* @param y to be documented.
* @return to be documented.
* @ingroup Evas_Object_Textblock
*/
EAPI int
evas_textblock_cursor_line_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord y)
@ -4761,7 +4719,6 @@ evas_textblock_cursor_line_coord_set(Evas_Textblock_Cursor *cur, Evas_Coord y)
* @param cur1 to be documented.
* @param cur2 to be documented.
* @return to be documented.
* @ingroup Evas_Object_Textblock
*/
EAPI Eina_List *
evas_textblock_cursor_range_geometry_get(const Evas_Textblock_Cursor *cur1, const Evas_Textblock_Cursor *cur2)
@ -4867,7 +4824,6 @@ evas_textblock_cursor_range_geometry_get(const Evas_Textblock_Cursor *cur1, cons
* @param cw to be documented.
* @param ch to be documented.
* @return to be documented.
* @ingroup Evas_Object_Textblock
*/
EAPI Evas_Bool
evas_object_textblock_line_number_geometry_get(const Evas_Object *obj, int line, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch)
@ -4888,7 +4844,6 @@ evas_object_textblock_line_number_geometry_get(const Evas_Object *obj, int line,
* to be documented.
* @param obj to be documented.
* @return Returns no value.
* @ingroup Evas_Object_Textblock
*/
EAPI void
evas_object_textblock_clear(Evas_Object *obj)
@ -4928,7 +4883,6 @@ evas_object_textblock_clear(Evas_Object *obj)
* @param w to be documented.
* @param h to be documented.
* @return Returns no value.
* @ingroup Evas_Object_Textblock
*/
EAPI void
evas_object_textblock_size_formatted_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h)
@ -4945,7 +4899,6 @@ evas_object_textblock_size_formatted_get(const Evas_Object *obj, Evas_Coord *w,
* @param w to be documented.
* @param h to be documented.
* @return Returns no value.
* @ingroup Evas_Object_Textblock
*/
EAPI void
evas_object_textblock_size_native_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h)
@ -4971,7 +4924,6 @@ evas_object_textblock_size_native_get(const Evas_Object *obj, Evas_Coord *w, Eva
* @param t to be documented.
* @param b to be documented.
* @return Returns no value.
* @ingroup Evas_Object_Textblock
*/
EAPI void
evas_object_textblock_style_insets_get(const Evas_Object *obj, Evas_Coord *l, Evas_Coord *r, Evas_Coord *t, Evas_Coord *b)
@ -4984,6 +4936,10 @@ evas_object_textblock_style_insets_get(const Evas_Object *obj, Evas_Coord *l, Ev
if (b) *b = o->style_pad.b;
}
/**
* @}
*/
/* all nice and private */
static void
evas_object_textblock_init(Evas_Object *obj)