forked from enlightenment/enlightenment
e_menu_category_callback create callback parameter order has changed to be consistent with the rest of the efl: data param always comes first
SVN revision: 82547
This commit is contained in:
parent
a428601f56
commit
f927968340
|
@ -8,6 +8,7 @@
|
||||||
* E_LIST_HANDLER_APPEND macro now asserts the event handler to make debugging easier
|
* E_LIST_HANDLER_APPEND macro now asserts the event handler to make debugging easier
|
||||||
* fixed bug where internal dialogs would not redraw after unfullscreening
|
* fixed bug where internal dialogs would not redraw after unfullscreening
|
||||||
* config submenu now sets "config" category
|
* config submenu now sets "config" category
|
||||||
|
* e_menu_category_callback create callback parameter order has been changed
|
||||||
|
|
||||||
2013-01-10 Deon Thomas
|
2013-01-10 Deon Thomas
|
||||||
|
|
||||||
|
|
3
NEWS
3
NEWS
|
@ -23,6 +23,9 @@ Additions:
|
||||||
* Added option for doing desklock, blanking or dimming even when showing fullscreen windows.
|
* Added option for doing desklock, blanking or dimming even when showing fullscreen windows.
|
||||||
* Added option for disabling pointer warping when performing directional focus changes using winlist
|
* Added option for disabling pointer warping when performing directional focus changes using winlist
|
||||||
|
|
||||||
|
Changes:
|
||||||
|
API:
|
||||||
|
* e_menu_category_callback create callback parameter order has been changed
|
||||||
|
|
||||||
Deprecations:
|
Deprecations:
|
||||||
*
|
*
|
||||||
|
|
|
@ -557,7 +557,7 @@ e_menu_category_data_set(char *category, void *data)
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI E_Menu_Category_Callback *
|
EAPI E_Menu_Category_Callback *
|
||||||
e_menu_category_callback_add(char *category, void (*create_cb)(E_Menu *m, void *category_data, void *data), void (*free_cb)(void *data), void *data)
|
e_menu_category_callback_add(char *category, void (*create_cb) (void *data, E_Menu *m, void *category_data), Ecore_Cb free_cb, void *data)
|
||||||
{
|
{
|
||||||
E_Menu_Category *cat;
|
E_Menu_Category *cat;
|
||||||
E_Menu_Category_Callback *cb = NULL;
|
E_Menu_Category_Callback *cb = NULL;
|
||||||
|
@ -2120,7 +2120,7 @@ _e_menu_activate_internal(E_Menu *m, E_Zone *zone)
|
||||||
{
|
{
|
||||||
E_Menu_Category_Callback *cb;
|
E_Menu_Category_Callback *cb;
|
||||||
EINA_LIST_FOREACH(cat->callbacks, l, cb)
|
EINA_LIST_FOREACH(cat->callbacks, l, cb)
|
||||||
if (cb->create) cb->create(m, cat->data, cb->data);
|
if (cb->create) cb->create(cb->data, m, cat->data);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
m->cur.visible = 1;
|
m->cur.visible = 1;
|
||||||
|
|
|
@ -153,8 +153,8 @@ struct _E_Menu_Category_Callback
|
||||||
{
|
{
|
||||||
const char *category;
|
const char *category;
|
||||||
void *data;
|
void *data;
|
||||||
void (*create) (E_Menu *m, void *category_data, void *data);
|
void (*create) (void *data, E_Menu *m, void *category_data);
|
||||||
void (*free) (void *data);
|
Ecore_Cb free;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
@ -175,7 +175,7 @@ EAPI void e_menu_icon_file_set(E_Menu *m, const char *icon);
|
||||||
/* menu categories functions */
|
/* menu categories functions */
|
||||||
EAPI void e_menu_category_set(E_Menu *m, const char *category);
|
EAPI void e_menu_category_set(E_Menu *m, const char *category);
|
||||||
EAPI void e_menu_category_data_set(char *category, void *data);
|
EAPI void e_menu_category_data_set(char *category, void *data);
|
||||||
EAPI E_Menu_Category_Callback *e_menu_category_callback_add(char *category, void (*create) (E_Menu *m, void *category_data, void *data), void (free) (void *data), void *data);
|
EAPI E_Menu_Category_Callback *e_menu_category_callback_add(char *category, void (*create_cb) (void *data, E_Menu *m, void *category_data), Ecore_Cb free_cb, void *data);
|
||||||
EAPI void e_menu_category_callback_del(E_Menu_Category_Callback *cb);
|
EAPI void e_menu_category_callback_del(E_Menu_Category_Callback *cb);
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
static void _gadman_maug_cb(void *data, E_Menu *m, E_Menu_Item *mi);
|
static void _gadman_maug_cb(void *data, E_Menu *m, E_Menu_Item *mi);
|
||||||
static void _gadman_maug_add(void *data, E_Menu *m);
|
static void _gadman_maug_add(void *data, E_Menu *m);
|
||||||
static void _gadman_action_cb(E_Object *obj, const char *params);
|
static void _gadman_action_cb(E_Object *obj, const char *params);
|
||||||
static void _gadman_desktop_menu(E_Menu *m, void *d __UNUSED__, void *icon);
|
static void _gadman_desktop_menu(void *d __UNUSED__, E_Menu *m, void *icon);
|
||||||
|
|
||||||
/* public module routines. all modules must have these */
|
/* public module routines. all modules must have these */
|
||||||
EAPI E_Module_Api e_modapi =
|
EAPI E_Module_Api e_modapi =
|
||||||
|
@ -171,7 +171,7 @@ _gadman_desktop_menu_cb(void *data __UNUSED__, E_Menu *m, E_Menu_Item *mi __UNUS
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_gadman_desktop_menu(E_Menu *m, void *d __UNUSED__, void *icon)
|
_gadman_desktop_menu(void *d __UNUSED__, E_Menu *m, void *icon)
|
||||||
{
|
{
|
||||||
E_Menu_Item *mi;
|
E_Menu_Item *mi;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue