efl_ui_multibuttonentry: Fix wrong defined function type.

legacy should be maintain.
efl_ui_XXX using efl_format_cb_set().

Tizen only mark will be deleted after upstream work finished.

Change-Id: I414d64585a61ec9f66d7668a46bc3254fb2c7f3a

diff --git a/src/bin/elementary/test_multibuttonentry.c b/src/bin/elementary/test_multibuttonentry.c
index 2d37141..e0d40ce 100644 (file)
--- a/src/bin/elementary/test_multibuttonentry.c
+++ b/src/bin/elementary/test_multibuttonentry.c
@@ -3,7 +3,10 @@
 #endif
 #include <Elementary.h>
 
-static Efl_Ui_Multibuttonentry_Format_Cb format_func = NULL;
+//TIZEN_ONLY(20180222): It's wrong point on upstream.
+//static Efl_Ui_Multibuttonentry_Format_Cb format_func = NULL;
+static Elm_Multibuttonentry_Format_Cb format_func = NULL;
+//
 
 static char *
 _custom_format(int count, void *data EINA_UNUSED)

diff --git a/src/lib/elementary/efl_ui_multibuttonentry.c b/src/lib/elementary/efl_ui_multibuttonentry.c
index 22c0405..4b9cb6c 100644 (file)
--- a/src/lib/elementary/efl_ui_multibuttonentry.c
+++ b/src/lib/elementary/efl_ui_multibuttonentry.c
@@ -2288,7 +2288,10 @@ ELM_PART_OVERRIDE_TEXT_GET(efl_ui_multibuttonentry, EFL_UI_MULTIBUTTONENTRY, Efl
 
 typedef struct
 {
-   Efl_Ui_Multibuttonentry_Format_Cb format_cb;
+   //TIZEN_ONLY(20180222): It's wrong point on upstream.
+   //Efl_Ui_Multibuttonentry_Format_Cb format_cb;
+   Elm_Multibuttonentry_Format_Cb format_cb;
+   //
    void *data;
 } Mbe_Format_Wrapper_Data ;
 
@@ -2319,7 +2322,10 @@ _format_legacy_to_format_eo_free_cb(void *data)
 }
 
 EAPI void
-elm_multibuttonentry_format_function_set(Eo *obj, Efl_Ui_Multibuttonentry_Format_Cb format_function, const void *data)
+//TIZEN_ONLY(20180222): It's wrong point on upstream.
+//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));
 

diff --git a/src/lib/elementary/elc_multibuttonentry_common.h b/src/lib/elementary/elc_multibuttonentry_common.h
index 8601dbf..5b250cd 100644 (file)
--- a/src/lib/elementary/elc_multibuttonentry_common.h
+++ b/src/lib/elementary/elc_multibuttonentry_common.h
@@ -30,4 +30,7 @@ typedef Eina_Bool                   (*Elm_Multibuttonentry_Item_Filter_Cb)(Evas_
  *
  * @ingroup Multibuttonentry
  */
-typedef char * (*Efl_Ui_Multibuttonentry_Format_Cb)(int count, void *data);
+//TIZEN_ONLY(20180222): It's wrong point on upstream.
+//typedef char * (*Efl_Ui_Multibuttonentry_Format_Cb)(int count, void *data);
+typedef char * (*Elm_Multibuttonentry_Format_Cb)(int count, void *data);
+//

diff --git a/src/lib/elementary/elc_multibuttonentry_legacy.h b/src/lib/elementary/elc_multibuttonentry_legacy.h
index 8831fe7..2bf87b8 100644 (file)
--- a/src/lib/elementary/elc_multibuttonentry_legacy.h
+++ b/src/lib/elementary/elc_multibuttonentry_legacy.h
@@ -24,7 +24,9 @@ EAPI Evas_Object               *elm_multibuttonentry_add(Evas_Object *parent);
  *
  * @ingroup Multibuttonentry
  */
- EAPI void elm_multibuttonentry_format_function_set(Eo *obj, Efl_Ui_Multibuttonentry_Format_Cb format_function, const void *data);
+//TIZEN_ONLY(20180222): It's wrong point on upstream.
+//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 "efl_ui_multibuttonentry.eo.legacy.h"