From 5e21f9da54205b5ff1eeb3b4a9412fe5e2651254 Mon Sep 17 00:00:00 2001 From: Andy Williams Date: Sat, 24 Jan 2015 08:26:09 +0000 Subject: [PATCH] Fix eo and regen to generate the right code based on okra's changes. We need to inherit from Elm_Box and not get in the way of smart resizing... --- elm_code/lib/elm_code_widget2.eo | 3 +-- elm_code/lib/elm_code_widget2.eo.c | 6 +----- elm_code/lib/regen.sh | 1 + 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/elm_code/lib/elm_code_widget2.eo b/elm_code/lib/elm_code_widget2.eo index 9104233..63bc5d2 100644 --- a/elm_code/lib/elm_code_widget2.eo +++ b/elm_code/lib/elm_code_widget2.eo @@ -1,4 +1,4 @@ -class Elm_Code_Widget2 (Elm_Layout, Elm_Interface_Scrollable, +class Elm_Code_Widget2 (Elm_Box, Elm_Interface_Scrollable, Elm_Interface_Atspi_Text) { eo_prefix: elm_code_widget2; @@ -19,7 +19,6 @@ class Elm_Code_Widget2 (Elm_Layout, Elm_Interface_Scrollable, class.constructor; Eo.Base.constructor; Evas.Object_Smart.add; - Evas.Object_Smart.resize; Elm_Interface_Scrollable.content_pos_set; } events { diff --git a/elm_code/lib/elm_code_widget2.eo.c b/elm_code/lib/elm_code_widget2.eo.c index 827bba3..b689d76 100644 --- a/elm_code/lib/elm_code_widget2.eo.c +++ b/elm_code/lib/elm_code_widget2.eo.c @@ -17,16 +17,12 @@ void _elm_code_widget2_eo_base_constructor(Eo *obj, Elm_Code_Widget2_Data *pd); void _elm_code_widget2_evas_object_smart_add(Eo *obj, Elm_Code_Widget2_Data *pd); -void _elm_code_widget2_evas_object_smart_resize(Eo *obj, Elm_Code_Widget2_Data *pd, Evas_Coord w, Evas_Coord h); - - void _elm_code_widget2_elm_interface_scrollable_content_pos_set(Eo *obj, Elm_Code_Widget2_Data *pd, Evas_Coord x, Evas_Coord y, Eina_Bool sig); static Eo_Op_Description _elm_code_widget2_op_desc[] = { EO_OP_FUNC_OVERRIDE(eo_constructor, _elm_code_widget2_eo_base_constructor), EO_OP_FUNC_OVERRIDE(evas_obj_smart_add, _elm_code_widget2_evas_object_smart_add), -// EO_OP_FUNC_OVERRIDE(evas_obj_smart_resize, _elm_code_widget2_evas_object_smart_resize), EO_OP_FUNC_OVERRIDE(elm_interface_scrollable_content_pos_set, _elm_code_widget2_elm_interface_scrollable_content_pos_set), EO_OP_FUNC(elm_code_widget2_font_size_set, _elm_code_widget2_font_size_set, ""), EO_OP_FUNC(elm_code_widget2_font_size_get, _elm_code_widget2_font_size_get, ""), @@ -50,4 +46,4 @@ static const Eo_Class_Description _elm_code_widget2_class_desc = { NULL }; -EO_DEFINE_CLASS(elm_code_widget2_class_get, &_elm_code_widget2_class_desc, ELM_BOX_CLASS, ELM_INTERFACE_SCROLLABLE_MIXIN, ELM_INTERFACE_ATSPI_TEXT_INTERFACE, NULL); +EO_DEFINE_CLASS(elm_code_widget2_class_get, &_elm_code_widget2_class_desc, ELM_BOX_CLASS, ELM_INTERFACE_SCROLLABLE_MIXIN, ELM_INTERFACE_ATSPI_TEXT_INTERFACE, NULL); \ No newline at end of file diff --git a/elm_code/lib/regen.sh b/elm_code/lib/regen.sh index 51acc50..055f8e7 100755 --- a/elm_code/lib/regen.sh +++ b/elm_code/lib/regen.sh @@ -1,4 +1,5 @@ #!/bin/sh +cd `dirname $0` INCLUDE="-I /usr/local/share/eolian/include/eo-1 -I /usr/local/share/eolian/include/elementary-1 -I /usr/local/share/eolian/include/evas-1 -I /usr/local/share/eolian/include/efl-1"