Merge "[elm_multibuttonentry.c]Applied nbeat-theme button style to Multibuttonentry...

diff --git a/src/lib/elm_multibuttonentry.c b/src/lib/elm_multibuttonentry.c
index 34bca54..900dc6f 100644 (file)
--- a/src/lib/elm_multibuttonentry.c
+++ b/src/lib/elm_multibuttonentry.c
@@ -740,7 +740,13 @@ _add_button_item(Evas_Object *obj, const char *str, Multibuttonentry_Pos pos, co
 \r
    // add button\r
    btn = edje_object_add(evas_object_evas_get(obj));\r
-   _elm_theme_object_set(obj, btn, "multibuttonentry", "btn", elm_widget_style_get(obj));\r
+\r
+   const char *btn_style = edje_object_data_get(wd->base,"button");\r
+\r
+   if (!btn_style || !strcmp(btn_style,"rect"))\r
+     _elm_theme_object_set(obj,btn,"multibuttonentry","rect_btn",elm_widget_style_get(obj));\r
+   else\r
+     _elm_theme_object_set(obj, btn, "multibuttonentry", "btn", elm_widget_style_get(obj));\r
    edje_object_signal_callback_add(btn, "mouse,clicked,1", "*", _button_clicked, obj);\r
    evas_object_size_hint_weight_set(btn, 0.0, 0.0);\r
    evas_object_show(btn);\r