BINDINGS/python,cxx,perl,vala - Elm_List_Item -> Elm_Object_Item

SVN revision: 67114
This commit is contained in:
ChunEon Park 2012-01-12 05:13:20 +00:00
parent f663bc1480
commit 9e085ddc95
3 changed files with 26 additions and 26 deletions

View File

@ -20,7 +20,7 @@ namespace Elmxx {
*/
class List : public Object
{
public:
public:
static List *factory (Evasxx::Object &parent);
void clear ();
@ -35,14 +35,14 @@ public:
const Eina_List *getItems (); // TODO: port Eina_List
Elm_List_Item *getSelectedItem (); // TODO port Elm_List_Item
Elm_Object_Item *getSelectedItem (); // TODO port Elm_List_Item
const Eina_List *getSelectedItems (); // TODO: port Eina_List
Elm_List_Item *append (const std::string &label, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data);
Elm_List_Item *append (const std::string &label, const Evasxx::Object &icon, const Evasxx::Object &end, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data);
Elm_Object_Item *append (const std::string &label, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data);
Elm_Object_Item *append (const std::string &label, const Evasxx::Object &icon, const Evasxx::Object &end, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data);
private:
List (); // forbid standard constructor
List (const List&); // forbid copy constructor
@ -51,10 +51,10 @@ private:
};
#if 0
EAPI Elm_List_Item *elm_list_item_append(Evas_Object *obj, const char *label, Evas_Object *icon, Evas_Object *end, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data);
EAPI Elm_List_Item *elm_list_item_prepend(Evas_Object *obj, const char *label, Evas_Object *icon, Evas_Object *end, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data);
EAPI Elm_List_Item *elm_list_item_insert_before(Evas_Object *obj, Elm_List_Item *before, const char *label, Evas_Object *icon, Evas_Object *end, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data);
EAPI Elm_List_Item *elm_list_item_insert_after(Evas_Object *obj, Elm_List_Item *after, const char *label, Evas_Object *icon, Evas_Object *end, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data);
EAPI Elm_Object_Item *elm_list_item_append(Evas_Object *obj, const char *label, Evas_Object *icon, Evas_Object *end, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data);
EAPI Elm_Object_Item *elm_list_item_prepend(Evas_Object *obj, const char *label, Evas_Object *icon, Evas_Object *end, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data);
EAPI Elm_Object_Item *elm_list_item_insert_before(Evas_Object *obj, Elm_List_Item *before, const char *label, Evas_Object *icon, Evas_Object *end, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data);
EAPI Elm_Object_Item *elm_list_item_insert_after(Evas_Object *obj, Elm_List_Item *after, const char *label, Evas_Object *icon, Evas_Object *end, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data);
#endif
} // end namespace Elmxx

View File

@ -20,7 +20,7 @@ public:
virtual ~ListItem ();
static ListItem *factory ();
void setSelected (bool selected);
void show ();
@ -43,22 +43,22 @@ private:
ListItem (); // forbid standard constructor
ListItem (const ListItem&); // forbid copy constructor
//ListItem (Evasxx::Object &parent); // private construction -> use factory ()
Elm_List_Item *mItem;
Elm_Object_Item *mItem;
};
#if 0
EAPI void elm_list_item_del(Elm_List_Item *item);
EAPI void elm_list_item_del_cb_set(Elm_List_Item *item, void (*func)(void *data, Evas_Object *obj, void *event_info));
EAPI const void *elm_list_item_data_get(const Elm_List_Item *item);
EAPI Evas_Object *elm_list_item_icon_get(const Elm_List_Item *item);
EAPI Evas_Object *elm_list_item_end_get(const Elm_List_Item *item);
EAPI Evas_Object *elm_list_item_object_get(const Elm_List_Item *item);
EAPI const char *elm_list_item_label_get(const Elm_List_Item *item);
EAPI Elm_List_Item *elm_list_item_prev(const Elm_List_Item *it);
EAPI Elm_List_Item *elm_list_item_next(const Elm_List_Item *it);
EAPI void elm_list_item_del(Elm_Object_Item *item);
EAPI void elm_list_item_del_cb_set(Elm_Object_Item *item, void (*func)(void *data, Evas_Object *obj, void *event_info));
EAPI const void *elm_list_item_data_get(const Elm_Object_Item *item);
EAPI Evas_Object *elm_list_item_icon_get(const Elm_Object_Item *item);
EAPI Evas_Object *elm_list_item_end_get(const Elm_Object_Item *item);
EAPI Evas_Object *elm_list_item_object_get(const Elm_Object_Item *item);
EAPI const char *elm_list_item_label_get(const Elm_Object_Item *item);
EAPI Elm_List_Item *elm_list_item_prev(const Elm_Object_Item *it);
EAPI Elm_List_Item *elm_list_item_next(const Elm_Object_Item *it);
#endif

View File

@ -11,7 +11,7 @@ namespace Elmxx {
List::List (Evasxx::Object &parent)
{
o = elm_list_add (parent.obj ());
elmInit ();
}
@ -52,7 +52,7 @@ const Eina_List *List::getItems ()
return elm_list_items_get (o);
}
Elm_List_Item *List::getSelectedItem ()
Elm_Object_Item *List::getSelectedItem ()
{
return elm_list_selected_item_get (o);
}
@ -62,12 +62,12 @@ const Eina_List *List::getSelectedItems ()
return elm_list_selected_items_get (o);
}
Elm_List_Item *List::append (const std::string &label, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data)
Elm_Object_Item *List::append (const std::string &label, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data)
{
return elm_list_item_append (o, label.c_str (), NULL, NULL, func, data);
}
Elm_List_Item *List::append (const std::string &label, const Evasxx::Object &icon, const Evasxx::Object &end, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data)
Elm_Object_Item *List::append (const std::string &label, const Evasxx::Object &icon, const Evasxx::Object &end, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data)
{
return elm_list_item_append (o, label.c_str (), icon.obj (), end.obj (), func, data);
}