From: Enlightenment S. <no-...@en...> - 2011-11-05 20:16:34
|
Log: compiles with new API and new classes - not yet tested... Author: andreas Date: 2011-11-05 13:16:28 -0700 (Sat, 05 Nov 2011) New Revision: 64790 Trac: http://trac.enlightenment.org/e/changeset/64790 Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenItem.h trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Makefile.am trunk/BINDINGS/cxx/elementaryxx/src/Gen.cpp trunk/BINDINGS/cxx/elementaryxx/src/GenItem.cpp trunk/BINDINGS/cxx/elementaryxx/src/GenList.cpp trunk/BINDINGS/cxx/elementaryxx/src/Makefile.am Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenItem.h =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenItem.h 2011-11-05 19:54:18 UTC (rev 64789) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/GenItem.h 2011-11-05 20:16:28 UTC (rev 64790) @@ -14,7 +14,6 @@ class Gen; class GenDataModel; -// TODO: currently this has many genlist functions inside. I'll fix this correct after the C API is finished! class GenItem { public: @@ -23,37 +22,14 @@ virtual ~GenItem (); - void clearSubItems (); void setSelected (bool selected); bool getSelected () const; - void setExpanded (bool expanded); - bool getExpanded () const; - void setDisabled (bool disabled); - bool getDisabled () const; - void setDisplayOnly (bool displayOnly); - bool getDisplayOnly () const; - void show (); - void bringIn (); - void showTop (); - void bringInTop (); - void showMiddle (); - void bringInMiddle (); - void update (); - - const Evasxx::Object *getEvasObject (); - static GenItem *wrap (Elm_Genlist_Item &item, GenDataModel &model); - - static GenItem *objectLink (const Elm_Genlist_Item *item); - -private: - GenItem (Elm_Genlist_Item *item); - - const void *getData (); - void setData (const void *data); - +protected: + GenItem (); Elm_Gen_Item *mItem; GenDataModel *mDataModel; + }; } // end namespace Elmxx Modified: trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Makefile.am =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Makefile.am 2011-11-05 19:54:18 UTC (rev 64789) +++ trunk/BINDINGS/cxx/elementaryxx/include/elementaryxx/Makefile.am 2011-11-05 20:16:28 UTC (rev 64790) @@ -35,7 +35,8 @@ GenListColumnConstructor.h \ GenListColumnSelector.h \ Gen.h \ - GenItem.h + GenItem.h \ + GenListItem.h libelementaryxxdir = \ $(pkgincludedir) Modified: trunk/BINDINGS/cxx/elementaryxx/src/Gen.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/Gen.cpp 2011-11-05 19:54:18 UTC (rev 64789) +++ trunk/BINDINGS/cxx/elementaryxx/src/Gen.cpp 2011-11-05 20:16:28 UTC (rev 64790) @@ -13,6 +13,10 @@ namespace Elmxx { +Gen::Gen () {} + +Gen::~Gen () {} + void Gen::clear () { elm_gen_clear (o); Modified: trunk/BINDINGS/cxx/elementaryxx/src/GenItem.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/GenItem.cpp 2011-11-05 19:54:18 UTC (rev 64789) +++ trunk/BINDINGS/cxx/elementaryxx/src/GenItem.cpp 2011-11-05 20:16:28 UTC (rev 64790) @@ -14,128 +14,14 @@ namespace Elmxx { -GenItem::GenItem (Elm_Genlist_Item *item) : - mItem (item) +GenItem::GenItem () { } GenItem::~GenItem () { - cout << "GenItem::~GenItem" << endl; - elm_genlist_item_del (mItem); } -void GenItem::clearSubItems () -{ - elm_genlist_item_subitems_clear (mItem); -} - -void GenItem::setSelected (bool selected) -{ - elm_gen_item_selected_set (mItem, selected); -} - -bool GenItem::getSelected () const -{ - return elm_gen_item_selected_get (mItem); -} - -void GenItem::setExpanded (bool expanded) -{ - elm_genlist_item_expanded_set (mItem, expanded); -} - -bool GenItem::getExpanded () const -{ - return elm_genlist_item_expanded_get (mItem); -} - -void GenItem::setDisabled (bool disabled) -{ - elm_genlist_item_disabled_set (mItem, disabled); -} - -bool GenItem::getDisabled () const -{ - return elm_genlist_item_disabled_get (mItem); -} - -void GenItem::setDisplayOnly (bool displayOnly) -{ - elm_genlist_item_display_only_set (mItem, displayOnly); -} - -bool GenItem::getDisplayOnly () const -{ - return elm_genlist_item_display_only_get (mItem); -} - -void GenItem::show () -{ - elm_genlist_item_show (mItem); -} - -void GenItem::bringIn () -{ - elm_genlist_item_bring_in (mItem); -} - -void GenItem::showTop () -{ - elm_genlist_item_top_show (mItem); -} - -void GenItem::bringInTop () -{ - elm_genlist_item_top_bring_in (mItem); -} - -void GenItem::showMiddle () -{ - elm_genlist_item_middle_show (mItem); -} - -void GenItem::bringInMiddle () -{ - elm_genlist_item_middle_bring_in (mItem); -} - -void GenItem::update () -{ - elm_genlist_item_update (mItem); -} - -const Evasxx::Object *GenItem::getEvasObject () -{ - const Evas_Object *obj = elm_genlist_item_object_get (mItem); - return Evasxx::Object::objectLink (obj); -} - -GenItem *GenItem::wrap (Elm_Genlist_Item &item, GenDataModel &model) -{ - GenItem *genItem = new GenItem (&item); - genItem->mDataModel = &model; - //model.signalDel.connect (sigc::mem_fun (genItem, &GenItem::destroy)); - - return genItem; -} - -GenItem *GenItem::objectLink (const Elm_Genlist_Item *item) -{ - //GenItem *item2 = static_cast <GenItem*> (const_cast <void*> (elm_genlist_item_data_get(item))); - //assert (item2); - return NULL;//item2; -} - -const void *GenItem::getData () -{ - return elm_genlist_item_data_get (mItem); -} - -void GenItem::setData (const void *data) -{ - elm_genlist_item_data_set (mItem, data); -} } // end namespace Elmxx Modified: trunk/BINDINGS/cxx/elementaryxx/src/GenList.cpp =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/GenList.cpp 2011-11-05 19:54:18 UTC (rev 64789) +++ trunk/BINDINGS/cxx/elementaryxx/src/GenList.cpp 2011-11-05 20:16:28 UTC (rev 64790) @@ -4,6 +4,7 @@ /* Project */ #include "../include/elementaryxx/GenList.h" +#include "../include/elementaryxx/GenListItem.h" #include "../include/elementaryxx/GenItem.h" #include "../include/elementaryxx/GenListColumnConstructor.h" #include "../include/elementaryxx/GenListColumnSelector.h" @@ -195,7 +196,7 @@ break; } - GenItem *item = GenItem::wrap (*gli, *mModel); + GenListItem *item = GenListItem::wrap (*gli, *mModel); // TODO: generic!! construction->mGenItem = item; Modified: trunk/BINDINGS/cxx/elementaryxx/src/Makefile.am =================================================================== --- trunk/BINDINGS/cxx/elementaryxx/src/Makefile.am 2011-11-05 19:54:18 UTC (rev 64789) +++ trunk/BINDINGS/cxx/elementaryxx/src/Makefile.am 2011-11-05 20:16:28 UTC (rev 64790) @@ -53,5 +53,6 @@ localUtil.cpp \ localUtil.h \ Gen.cpp \ - GenItem.cpp + GenItem.cpp \ + GenListItem.cpp |