SVN revision: 52585
This commit is contained in:
Carsten Haitzler 2010-09-22 11:57:19 +00:00
parent c4d77fea71
commit 80e131a443
1 changed files with 27 additions and 33 deletions

View File

@ -1497,9 +1497,7 @@ typedef void (*Evas_Object_Image_Pixels_Get_Cb) (void *data, Evas_Object *o);
struct _Evas_Smart_Class
{
const char *name; /**< the string name of the class */
int version;
void (*add) (Evas_Object *o);
void (*del) (Evas_Object *o);
void (*move) (Evas_Object *o, Evas_Coord x, Evas_Coord y);
@ -1515,9 +1513,7 @@ struct _Evas_Smart_Class
const Evas_Smart_Class *parent; /**< this class inherits from this parent */
const Evas_Smart_Cb_Description *callbacks; /**< callbacks at this level, NULL terminated */
void *interfaces; /**< to be used in a future near you */
const void *data;
};
@ -1731,11 +1727,9 @@ struct _Evas_Smart_Cb_Description
#define EVAS_SMART_DATA_ALLOC(o, priv_type) \
priv_type *priv; \
priv = evas_object_smart_data_get(o); \
if (!priv) \
{ \
if (!priv) { \
priv = (priv_type *)calloc(1, sizeof(priv_type)); \
if (!priv) \
return; \
if (!priv) return; \
evas_object_smart_data_set(o, priv); \
}