From 1c200331f1fc108ae582c0bce4d7fcaa35a38501 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Mon, 20 Nov 2017 20:22:48 +0900 Subject: [PATCH] button: Implement Efl.Content set/get/unset This fixes make check (cxx compilation). --- src/lib/elementary/efl_ui_button.c | 2 ++ src/lib/elementary/efl_ui_button.eo | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/lib/elementary/efl_ui_button.c b/src/lib/elementary/efl_ui_button.c index 65807549d4..36eaebd5bf 100644 --- a/src/lib/elementary/efl_ui_button.c +++ b/src/lib/elementary/efl_ui_button.c @@ -409,6 +409,8 @@ _efl_ui_button_class_constructor(Efl_Class *klass) ELM_WIDGET_KEY_DOWN_DEFAULT_IMPLEMENT(efl_ui_button, Efl_Ui_Button_Data) ELM_PART_TEXT_DEFAULT_IMPLEMENT(efl_ui_button, Efl_Ui_Button_Data) +ELM_PART_CONTENT_DEFAULT_SET(efl_ui_button, _content_aliases[0].real_part) +ELM_PART_CONTENT_DEFAULT_IMPLEMENT(efl_ui_button, Efl_Ui_Button_Data) /* Efl.Part begin */ diff --git a/src/lib/elementary/efl_ui_button.eo b/src/lib/elementary/efl_ui_button.eo index aa231ddc46..12b118a782 100644 --- a/src/lib/elementary/efl_ui_button.eo +++ b/src/lib/elementary/efl_ui_button.eo @@ -1,15 +1,13 @@ class Efl.Ui.Button (Efl.Ui.Layout, Efl.Ui.Clickable, Efl.Ui.Autorepeat, - Efl.Text, Efl.Text.Markup, + Efl.Text, Efl.Text.Markup, Efl.Content, Efl.Access.Widget.Action, Efl.Ui.Translatable) { [[Push-button widget - Press it and run some function. It can contain a simple label and icon object - and it also has an autorepeat feature. + Press it and run some function. It can contain a simple label and icon + object and it also has an autorepeat feature. ]] legacy_prefix: elm_button; - methods { - } implements { class.constructor; Efl.Object.constructor; @@ -23,6 +21,8 @@ class Efl.Ui.Button (Efl.Ui.Layout, Efl.Ui.Clickable, Efl.Ui.Autorepeat, Elm.Widget.widget_event; Efl.Access.Widget.Action.elm_actions { get; } Efl.Part.part; + Efl.Content.content { get; set; } + Efl.Content.content_unset; Efl.Text.text { get; set; } Efl.Ui.Translatable.translatable_text { get; set; } }