forked from enlightenment/efl
efl_ui_multibuttonentry: maintainance legacy function type.
Summary: I did it wrong. The "Elm_Multibuttonentry_Format_Cb" should be maintain for legacy. efl_ui_XXX has to use efl_format interface. @fix Test Plan: elementary_test->multibuttonentry sample. Reviewers: cedric, woohyun, Jaehyun Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D5824 Signed-off-by: Cedric Bail <cedric@osg.samsung.com>
This commit is contained in:
parent
255e9c788a
commit
6b29613bbe
|
@ -34,7 +34,6 @@ _bt_clicked(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUS
|
||||||
efl_ui_clock_pause_set(dt1, EINA_TRUE);
|
efl_ui_clock_pause_set(dt1, EINA_TRUE);
|
||||||
elm_datetime_value_set(dt1, &new_time);
|
elm_datetime_value_set(dt1, &new_time);
|
||||||
elm_object_disabled_set(dt1, EINA_TRUE);
|
elm_object_disabled_set(dt1, EINA_TRUE);
|
||||||
|
|
||||||
elm_object_disabled_set(obj, EINA_TRUE);
|
elm_object_disabled_set(obj, EINA_TRUE);
|
||||||
evas_object_del(dt2);
|
evas_object_del(dt2);
|
||||||
evas_object_del(dt3);
|
evas_object_del(dt3);
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
#endif
|
#endif
|
||||||
#include <Elementary.h>
|
#include <Elementary.h>
|
||||||
|
|
||||||
static Efl_Ui_Multibuttonentry_Format_Cb format_func = NULL;
|
static Elm_Multibuttonentry_Format_Cb format_func = NULL;
|
||||||
|
|
||||||
static char *
|
static char *
|
||||||
_custom_format(int count, void *data EINA_UNUSED)
|
_custom_format(int count, void *data EINA_UNUSED)
|
||||||
|
|
|
@ -2099,7 +2099,7 @@ elm_multibuttonentry_add(Evas_Object *parent)
|
||||||
|
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
Efl_Ui_Multibuttonentry_Format_Cb format_cb;
|
Elm_Multibuttonentry_Format_Cb format_cb;
|
||||||
void *data;
|
void *data;
|
||||||
} Mbe_Format_Wrapper_Data ;
|
} Mbe_Format_Wrapper_Data ;
|
||||||
|
|
||||||
|
@ -2130,7 +2130,7 @@ _format_legacy_to_format_eo_free_cb(void *data)
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI void
|
EAPI void
|
||||||
elm_multibuttonentry_format_function_set(Eo *obj, Efl_Ui_Multibuttonentry_Format_Cb format_function, const void *data)
|
elm_multibuttonentry_format_function_set(Eo *obj, Elm_Multibuttonentry_Format_Cb format_function, const void *data)
|
||||||
{
|
{
|
||||||
Mbe_Format_Wrapper_Data *mfwd = malloc(sizeof(Mbe_Format_Wrapper_Data));
|
Mbe_Format_Wrapper_Data *mfwd = malloc(sizeof(Mbe_Format_Wrapper_Data));
|
||||||
|
|
||||||
|
|
|
@ -30,4 +30,4 @@ typedef Eina_Bool (*Elm_Multibuttonentry_Item_Filter_Cb)(Evas_
|
||||||
*
|
*
|
||||||
* @ingroup Multibuttonentry
|
* @ingroup Multibuttonentry
|
||||||
*/
|
*/
|
||||||
typedef char * (*Efl_Ui_Multibuttonentry_Format_Cb)(int count, void *data);
|
typedef char * (*Elm_Multibuttonentry_Format_Cb)(int count, void *data);
|
||||||
|
|
|
@ -24,7 +24,7 @@ EAPI Evas_Object *elm_multibuttonentry_add(Evas_Object *parent);
|
||||||
*
|
*
|
||||||
* @ingroup Multibuttonentry
|
* @ingroup Multibuttonentry
|
||||||
*/
|
*/
|
||||||
EAPI void elm_multibuttonentry_format_function_set(Eo *obj, Efl_Ui_Multibuttonentry_Format_Cb format_function, const void *data);
|
EAPI void elm_multibuttonentry_format_function_set(Eo *obj, Elm_Multibuttonentry_Format_Cb format_function, const void *data);
|
||||||
|
|
||||||
#include "elm_multibuttonentry_item.eo.legacy.h"
|
#include "elm_multibuttonentry_item.eo.legacy.h"
|
||||||
#include "efl_ui_multibuttonentry.eo.legacy.h"
|
#include "efl_ui_multibuttonentry.eo.legacy.h"
|
||||||
|
|
Loading…
Reference in New Issue