tasn pushed a commit to branch master. http://git.enlightenment.org/bindings/cxx/eflxx.git/commit/?id=195173f60f288d5efc82fec99ccaa23bf03b4915
commit 195173f60f288d5efc82fec99ccaa23bf03b4915 Author: Andreas Volz <[email protected]> Date: Sat Mar 10 20:41:06 2012 +0000 compiles again after big changes in elementary C API. Need to repair much stuff, but will wait some more time until elementary is more API stable... SVN revision: 69179 --- elementaryxx/include/elementaryxx/Anchorblock.h | 35 ------------------- elementaryxx/include/elementaryxx/Anchorview.h | 35 ------------------- elementaryxx/include/elementaryxx/GenList.h | 10 +++--- elementaryxx/include/elementaryxx/GenListItem.h | 6 ++-- elementaryxx/include/elementaryxx/Makefile.am | 2 -- elementaryxx/src/Anchorblock.cpp | 45 ------------------------- elementaryxx/src/Anchorview.cpp | 45 ------------------------- elementaryxx/src/Bubble.cpp | 4 +-- elementaryxx/src/Button.cpp | 2 +- elementaryxx/src/Check.cpp | 2 +- elementaryxx/src/GenList.cpp | 26 +++++++------- elementaryxx/src/GenListItem.cpp | 10 +++--- elementaryxx/src/Makefile.am | 2 -- elementaryxx/src/Progressbar.cpp | 2 +- elementaryxx/src/Radio.cpp | 2 +- elementaryxx/src/Slider.cpp | 2 +- 16 files changed, 33 insertions(+), 197 deletions(-) diff --git a/elementaryxx/include/elementaryxx/Anchorblock.h b/elementaryxx/include/elementaryxx/Anchorblock.h deleted file mode 100644 index e59c7e9..0000000 --- a/elementaryxx/include/elementaryxx/Anchorblock.h +++ /dev/null @@ -1,35 +0,0 @@ -#ifndef ELMXX_ANCHORBLOCK_H -#define ELMXX_ANCHORBLOCK_H - -/* STL */ -#include <string> - -/* ELFxx */ -#include "Object.h" - -namespace Elmxx { - -/*! - * smart callbacks called: - * "anchor,clicked" - achor called was clicked | event_info = Elm_Entry_Anchorblock_Info - */ -class Anchorblock : public Object -{ -public: - static Anchorblock *factory (Evasxx::Object &parent); - -private: - Anchorblock (); // forbid standard constructor - Anchorblock (const Anchorblock&); // forbid copy constructor - Anchorblock (Evasxx::Object &parent); // private construction -> use factory () - ~Anchorblock (); // forbid direct delete -> use ElmWidget::destroy() - - void setText (const std::string &text); - void setHoverParent (Evasxx::Object &parent); - void setHoverStyle (const std::string &style); - void endHover (); -}; - -} // end namespace Elmxx - -#endif // ELMXX_ANCHORBLOCK_H diff --git a/elementaryxx/include/elementaryxx/Anchorview.h b/elementaryxx/include/elementaryxx/Anchorview.h deleted file mode 100644 index 10f44f4..0000000 --- a/elementaryxx/include/elementaryxx/Anchorview.h +++ /dev/null @@ -1,35 +0,0 @@ -#ifndef ELMXX_ANCHORVIEW_H -#define ELMXX_ANCHORVIEW_H - -/* STL */ -#include <string> - -/* ELFxx */ -#include "Object.h" - -namespace Elmxx { - -/*! - * smart callbacks called: - * "anchor,clicked" - achor called was clicked | event_info = Elm_Entry_Anchorview_Info - */ -class Anchorview : public Object -{ -public: - static Anchorview *factory (Evasxx::Object &parent); - -private: - Anchorview (); // forbid standard constructor - Anchorview (const Anchorview&); // forbid copy constructor - Anchorview (Evasxx::Object &parent); // private construction -> use factory () - ~Anchorview (); // forbid direct delete -> use ElmWidget::destroy() - - void setText (const std::string &text); - void setHoverParent (Evasxx::Object &parent); - void setHoverStyle (const std::string &style); - void endHover (); -}; - -} // end namespace Elmxx - -#endif // ELMXX_ANCHORVIEW_H diff --git a/elementaryxx/include/elementaryxx/GenList.h b/elementaryxx/include/elementaryxx/GenList.h index 1fef24a..0e59dc7 100644 --- a/elementaryxx/include/elementaryxx/GenList.h +++ b/elementaryxx/include/elementaryxx/GenList.h @@ -302,13 +302,13 @@ public: * @return A handle to the item added or NULL if not possible * */ - GenListItem *append (GenListColumnConstructor *construction, const GenListItem *parent, Elm_Genlist_Item_Flags flags, GenListColumnSelector *selection); + GenListItem *append (GenListColumnConstructor *construction, const GenListItem *parent, Elm_Genlist_Item_Type type, GenListColumnSelector *selection); - GenListItem *prepend (GenListColumnConstructor *construction, const GenListItem *parent, Elm_Genlist_Item_Flags flags, GenListColumnSelector *selection); + GenListItem *prepend (GenListColumnConstructor *construction, const GenListItem *parent, Elm_Genlist_Item_Type type, GenListColumnSelector *selection); - GenListItem *insertBefore (GenListColumnConstructor *construction, const GenListItem *parent, Elm_Genlist_Item_Flags flags, GenListColumnSelector *selection); + GenListItem *insertBefore (GenListColumnConstructor *construction, const GenListItem *parent, Elm_Genlist_Item_Type type, GenListColumnSelector *selection); - GenListItem *insertAfter (GenListColumnConstructor *construction, const GenListItem *parent, Elm_Genlist_Item_Flags flags, GenListColumnSelector *selection); + GenListItem *insertAfter (GenListColumnConstructor *construction, const GenListItem *parent, Elm_Genlist_Item_Type type, GenListColumnSelector *selection); void del (GenListItem &item); @@ -357,7 +357,7 @@ private: InsertBefore }; - GenListItem *insertInternal (GenListColumnConstructor *construction, GenList::InsertOperation op, const GenListItem *opItem, Elm_Genlist_Item_Flags flags, GenListColumnSelector *selection); + GenListItem *insertInternal (GenListColumnConstructor *construction, GenList::InsertOperation op, const GenListItem *opItem, Elm_Genlist_Item_Type type, GenListColumnSelector *selection); static void gl_sel (void *data, Evas_Object *obj, void *event_info); diff --git a/elementaryxx/include/elementaryxx/GenListItem.h b/elementaryxx/include/elementaryxx/GenListItem.h index 0ec3cc1..18a8ba2 100644 --- a/elementaryxx/include/elementaryxx/GenListItem.h +++ b/elementaryxx/include/elementaryxx/GenListItem.h @@ -32,8 +32,8 @@ public: bool getDisabled () const; void setDisplayOnly (bool displayOnly); bool getDisplayOnly () const; - void show (); - void bringIn (); + void show (Elm_Genlist_Item_Scrollto_Type type); + void bringIn (Elm_Genlist_Item_Scrollto_Type type); void showTop (); void bringInTop (); void showMiddle (); @@ -51,7 +51,7 @@ private: GenListItem (Elm_Object_Item *item); const void *getData (); - void setData (const void *data); + void setData (void *data); Elm_Object_Item *mItem; GenDataModel *mDataModel; diff --git a/elementaryxx/include/elementaryxx/Makefile.am b/elementaryxx/include/elementaryxx/Makefile.am index 2dcc284..3b3e44a 100644 --- a/elementaryxx/include/elementaryxx/Makefile.am +++ b/elementaryxx/include/elementaryxx/Makefile.am @@ -24,8 +24,6 @@ libelementaryxx_HEADERS = \ Object.h \ Layout.h \ Hover.h \ - Anchorblock.h \ - Anchorview.h \ Spinner.h \ Progressbar.h \ Panel.h \ diff --git a/elementaryxx/src/Anchorblock.cpp b/elementaryxx/src/Anchorblock.cpp deleted file mode 100644 index 2d033af..0000000 --- a/elementaryxx/src/Anchorblock.cpp +++ /dev/null @@ -1,45 +0,0 @@ -#ifdef HAVE_CONFIG_H - #include <config.h> -#endif - -#include "../include/elementaryxx/Anchorblock.h" - -using namespace std; - -namespace Elmxx { - -Anchorblock::Anchorblock (Evasxx::Object &parent) -{ - o = elm_anchorblock_add (parent.obj ()); - - elmInit (); -} - -Anchorblock::~Anchorblock () {} - -Anchorblock *Anchorblock::factory (Evasxx::Object &parent) -{ - return new Anchorblock (parent); -} - -void Anchorblock::setText (const std::string &text) -{ - elm_object_text_set (o, text.c_str ()); -} - -void Anchorblock::setHoverParent (Evasxx::Object &parent) -{ - elm_anchorblock_hover_parent_set (o, parent.obj ()); -} - -void Anchorblock::setHoverStyle (const std::string &style) -{ - elm_anchorblock_hover_style_set (o, style.c_str ()); -} - -void Anchorblock::endHover () -{ - elm_anchorblock_hover_end (o); -} - -} // end namespace Elmxx diff --git a/elementaryxx/src/Anchorview.cpp b/elementaryxx/src/Anchorview.cpp deleted file mode 100644 index 6738c7d..0000000 --- a/elementaryxx/src/Anchorview.cpp +++ /dev/null @@ -1,45 +0,0 @@ -#ifdef HAVE_CONFIG_H - #include <config.h> -#endif - -#include "../include/elementaryxx/Anchorview.h" - -using namespace std; - -namespace Elmxx { - -Anchorview::Anchorview (Evasxx::Object &parent) -{ - o = elm_anchorview_add (parent.obj ()); - - elmInit (); -} - -Anchorview::~Anchorview () {} - -Anchorview *Anchorview::factory (Evasxx::Object &parent) -{ - return new Anchorview (parent); -} - -void Anchorview::setText (const std::string &text) -{ - elm_object_text_set (o, text.c_str ()); -} - -void Anchorview::setHoverParent (Evasxx::Object &parent) -{ - elm_anchorview_hover_parent_set (o, parent.obj ()); -} - -void Anchorview::setHoverStyle (const std::string &style) -{ - elm_anchorview_hover_style_set (o, style.c_str ()); -} - -void Anchorview::endHover () -{ - elm_anchorview_hover_end (o); -} - -} // end namespace Elmxx diff --git a/elementaryxx/src/Bubble.cpp b/elementaryxx/src/Bubble.cpp index 51db595..fb8413d 100644 --- a/elementaryxx/src/Bubble.cpp +++ b/elementaryxx/src/Bubble.cpp @@ -29,7 +29,7 @@ void Bubble::setLabel (const std::string &label) void Bubble::setInfo (const std::string &info) { - elm_object_part_text_set (o, info.c_str ()); + elm_object_part_text_set (o, NULL, info.c_str ()); } void Bubble::setContent (const Evasxx::Object &content) @@ -39,7 +39,7 @@ void Bubble::setContent (const Evasxx::Object &content) void Bubble::setIcon (const Evasxx::Object &icon) { - elm_object_part_content_set (o, icon.obj ()); + elm_object_part_content_set (o, NULL, icon.obj ()); } void Bubble::setCorner (const std::string &corner) diff --git a/elementaryxx/src/Button.cpp b/elementaryxx/src/Button.cpp index d83e576..49e7908 100644 --- a/elementaryxx/src/Button.cpp +++ b/elementaryxx/src/Button.cpp @@ -29,7 +29,7 @@ void Button::setLabel (const std::string &label) void Button::setIcon (const Evasxx::Object &icon) { - elm_object_part_content_set (o, icon.obj ()); + elm_object_part_content_set (o, NULL, icon.obj ()); } } // end namespace Elmxx diff --git a/elementaryxx/src/Check.cpp b/elementaryxx/src/Check.cpp index 41c00ab..426298b 100644 --- a/elementaryxx/src/Check.cpp +++ b/elementaryxx/src/Check.cpp @@ -29,7 +29,7 @@ void Check::setLabel (const std::string &label) void Check::setIcon (const Evasxx::Object &icon) { - elm_object_part_content_set (o, icon.obj ()); + elm_object_part_content_set (o, NULL, icon.obj ()); } void Check::setState (bool state) diff --git a/elementaryxx/src/GenList.cpp b/elementaryxx/src/GenList.cpp index bfb48a5..474ff7c 100644 --- a/elementaryxx/src/GenList.cpp +++ b/elementaryxx/src/GenList.cpp @@ -108,27 +108,27 @@ void GenList::glSelected (GenListColumnSelector &selection, const Evasxx::Object /* operations to add items */ -GenListItem *GenList::append (GenListColumnConstructor *construction, const GenListItem *parent, Elm_Genlist_Item_Flags flags, GenListColumnSelector *selection) +GenListItem *GenList::append (GenListColumnConstructor *construction, const GenListItem *parent, Elm_Genlist_Item_Type type, GenListColumnSelector *selection) { - insertInternal (construction, GenList::Append, parent, flags, selection); + insertInternal (construction, GenList::Append, parent, type, selection); } -GenListItem *GenList::prepend (GenListColumnConstructor *construction, const GenListItem *parent, Elm_Genlist_Item_Flags flags, GenListColumnSelector *selection) +GenListItem *GenList::prepend (GenListColumnConstructor *construction, const GenListItem *parent, Elm_Genlist_Item_Type type, GenListColumnSelector *selection) { - insertInternal (construction, GenList::Prepend, parent, flags, selection); + insertInternal (construction, GenList::Prepend, parent, type, selection); } -GenListItem *GenList::insertBefore (GenListColumnConstructor *construction, const GenListItem *parent, Elm_Genlist_Item_Flags flags, GenListColumnSelector *selection) +GenListItem *GenList::insertBefore (GenListColumnConstructor *construction, const GenListItem *parent, Elm_Genlist_Item_Type type, GenListColumnSelector *selection) { - insertInternal (construction, GenList::InsertBefore, parent, flags, selection); + insertInternal (construction, GenList::InsertBefore, parent, type, selection); } -GenListItem *GenList::insertAfter (GenListColumnConstructor *construction, const GenListItem *parent, Elm_Genlist_Item_Flags flags, GenListColumnSelector *selection) +GenListItem *GenList::insertAfter (GenListColumnConstructor *construction, const GenListItem *parent, Elm_Genlist_Item_Type type, GenListColumnSelector *selection) { - insertInternal (construction, GenList::InsertAfter, parent, flags, selection); + insertInternal (construction, GenList::InsertAfter, parent, type, selection); } -GenListItem *GenList::insertInternal (GenListColumnConstructor *construction, GenList::InsertOperation op, const GenListItem *opItem, Elm_Genlist_Item_Flags flags, GenListColumnSelector *selection) +GenListItem *GenList::insertInternal (GenListColumnConstructor *construction, GenList::InsertOperation op, const GenListItem *opItem, Elm_Genlist_Item_Type type, GenListColumnSelector *selection) { assert (mModel); @@ -161,7 +161,7 @@ GenListItem *GenList::insertInternal (GenListColumnConstructor *construction, Ge gli = elm_genlist_item_append (o, &mModel->mGLIC, construction /* item data */, opItem ? opItem->mItem : NULL /* parent */, - flags, + type, GenList::gl_sel/* func */, selection /* func data */); break; @@ -170,7 +170,7 @@ GenListItem *GenList::insertInternal (GenListColumnConstructor *construction, Ge gli = elm_genlist_item_prepend (o, &mModel->mGLIC, construction /* item data */, opItem ? opItem->mItem : NULL /* parent */, - flags, + type, GenList::gl_sel/* func */, selection /* func data */); break; @@ -180,7 +180,7 @@ GenListItem *GenList::insertInternal (GenListColumnConstructor *construction, Ge construction /* item data */, opItem ? opItem->mItem : NULL /* parent */, NULL, - flags, + type, GenList::gl_sel/* func */, selection /* func data */); break; @@ -190,7 +190,7 @@ GenListItem *GenList::insertInternal (GenListColumnConstructor *construction, Ge construction /* item data */, opItem ? opItem->mItem : NULL /* parent */, NULL, - flags, + type, GenList::gl_sel/* func */, selection /* func data */); break; diff --git a/elementaryxx/src/GenListItem.cpp b/elementaryxx/src/GenListItem.cpp index aea2856..e76dd9e 100644 --- a/elementaryxx/src/GenListItem.cpp +++ b/elementaryxx/src/GenListItem.cpp @@ -72,14 +72,14 @@ bool GenListItem::getDisplayOnly () const return elm_genlist_item_display_only_get (mItem); } -void GenListItem::show () +void GenListItem::show (Elm_Genlist_Item_Scrollto_Type type) { - elm_genlist_item_show (mItem); + elm_genlist_item_show (mItem, type); } -void GenListItem::bringIn () +void GenListItem::bringIn (Elm_Genlist_Item_Scrollto_Type type) { - elm_genlist_item_bring_in (mItem); + elm_genlist_item_bring_in (mItem, type); } void GenListItem::showTop () @@ -134,7 +134,7 @@ const void *GenListItem::getData () return elm_object_item_data_get (mItem); } -void GenListItem::setData (const void *data) +void GenListItem::setData (void *data) { elm_object_item_data_set (mItem, data); } diff --git a/elementaryxx/src/Makefile.am b/elementaryxx/src/Makefile.am index 7877c6a..7814a26 100644 --- a/elementaryxx/src/Makefile.am +++ b/elementaryxx/src/Makefile.am @@ -40,8 +40,6 @@ libelementaryxx_la_SOURCES = \ Object.cpp \ Layout.cpp \ Hover.cpp \ - Anchorblock.cpp \ - Anchorview.cpp \ Spinner.cpp \ Progressbar.cpp \ Panel.cpp \ diff --git a/elementaryxx/src/Progressbar.cpp b/elementaryxx/src/Progressbar.cpp index 665d841..3c28e81 100644 --- a/elementaryxx/src/Progressbar.cpp +++ b/elementaryxx/src/Progressbar.cpp @@ -29,7 +29,7 @@ void Progressbar::setLabel (const std::string &label) void Progressbar::setIcon (Evasxx::Object &icon) { - elm_object_part_content_set (o, icon.obj ()); + elm_object_part_content_set (o, NULL, icon.obj ()); } void Progressbar::setSpanSize (Evas_Coord size) diff --git a/elementaryxx/src/Radio.cpp b/elementaryxx/src/Radio.cpp index 6e444a6..3081122 100644 --- a/elementaryxx/src/Radio.cpp +++ b/elementaryxx/src/Radio.cpp @@ -30,7 +30,7 @@ void Radio::setLabel (const std::string &label) void Radio::setIcon (const Evasxx::Object &icon) { - elm_object_part_content_set (o, icon.obj ()); + elm_object_part_content_set (o, NULL, icon.obj ()); } void Radio::addGroup (const Evasxx::Object &group) diff --git a/elementaryxx/src/Slider.cpp b/elementaryxx/src/Slider.cpp index 226ab91..920ff18 100644 --- a/elementaryxx/src/Slider.cpp +++ b/elementaryxx/src/Slider.cpp @@ -29,7 +29,7 @@ void Slider::setLabel (const std::string &label) void Slider::setIcon (const Evasxx::Object &icon) { - elm_object_part_content_set (o, icon.obj ()); + elm_object_part_content_set (o, NULL, icon.obj ()); } void Slider::setSpanSize (Evas_Coord size) --
