enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

Make elm build again (remove duplicated function declarations which 

had different params) ... come on people, at least build your code
before committing



SVN revision: 53422
This commit is contained in:
Christopher Michael 2010-10-14 18:18:34 +00:00
parent cafc4b9e19
commit a1128c6d91
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
legacy/elementary/src/lib/Elementary.h.in
View File

@ -1150,6 +1150,7 @@ extern "C" {
EAPI void elm_toolbar_align_set(Evas_Object *obj, double align);
EAPI double elm_toolbar_align_get(const Evas_Object *obj);
EAPI void elm_toolbar_item_menu_set(Elm_Toolbar_Item *item, Eina_Bool menu);
EAPI Evas_Object *elm_toolbar_item_menu_get(Elm_Toolbar_Item *item);
EAPI void elm_toolbar_item_tooltip_text_set(Elm_Toolbar_Item *item, const char *text);
EAPI void elm_toolbar_item_tooltip_content_cb_set(Elm_Toolbar_Item *item, Elm_Tooltip_Item_Content_Cb func, const void *data, Evas_Smart_Cb del_cb);
@ -1173,15 +1174,6 @@ extern "C" {
EAPI Elm_Toolbar_Item *elm_toolbar_item_find_by_label(Evas_Object *obj, const char *label);
EAPI void elm_toolbar_scrollable_set(Evas_Object *obj, Eina_Bool scrollable);
EAPI Eina_Bool elm_toolbar_scrollable_get(Evas_Object *obj);
EAPI void elm_toolbar_homogenous_set(Evas_Object *obj, Eina_Bool homogenous);
EAPI Eina_Bool elm_toolbar_homogenous_get(Evas_Object *obj);
EAPI void elm_toolbar_menu_parent_set(Evas_Object *obj, Evas_Object *parent);
EAPI Evas_Object *elm_toolbar_menu_parent_get(Evas_Object *obj);
EAPI void elm_toolbar_item_unselect_all(Evas_Object *obj);
EAPI void elm_toolbar_align_set(Evas_Object *obj, double align);
EAPI double elm_toolbar_align_get(const Evas_Object *obj);
EAPI void elm_toolbar_item_menu_set(Elm_Toolbar_Item *item, Eina_Bool menu);
EAPI Evas_Object *elm_toolbar_item_menu_get(Elm_Toolbar_Item *item);
/* smart callbacks called:
* "clicked" - when the user clicks on a toolbar item and becomes selected
*/

4
legacy/elementary/src/lib/elm_toolbar.c
View File

@ -940,12 +940,12 @@ elm_toolbar_menu_parent_set(Evas_Object *obj, Evas_Object *parent)
* @ingroup Toolbar
*/
EAPI Evas_Object *
elm_toolbar_menu_parent_get(Evas_Object *obj)
elm_toolbar_menu_parent_get(const Evas_Object *obj)
{
ELM_CHECK_WIDTYPE(obj, widtype) NULL;
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return NULL;
if (!wd) return NULL;
return wd->menu_parent;
}