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...
This commit is contained in:
parent
82e57792ca
commit
eec17b5904
|
@ -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)
|
Elm_Interface_Atspi_Text)
|
||||||
{
|
{
|
||||||
eo_prefix: elm_code_widget2;
|
eo_prefix: elm_code_widget2;
|
||||||
|
@ -19,7 +19,6 @@ class Elm_Code_Widget2 (Elm_Layout, Elm_Interface_Scrollable,
|
||||||
class.constructor;
|
class.constructor;
|
||||||
Eo.Base.constructor;
|
Eo.Base.constructor;
|
||||||
Evas.Object_Smart.add;
|
Evas.Object_Smart.add;
|
||||||
Evas.Object_Smart.resize;
|
|
||||||
Elm_Interface_Scrollable.content_pos_set;
|
Elm_Interface_Scrollable.content_pos_set;
|
||||||
}
|
}
|
||||||
events {
|
events {
|
||||||
|
|
|
@ -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_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);
|
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[] = {
|
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(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_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_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_set, _elm_code_widget2_font_size_set, ""),
|
||||||
EO_OP_FUNC(elm_code_widget2_font_size_get, _elm_code_widget2_font_size_get, ""),
|
EO_OP_FUNC(elm_code_widget2_font_size_get, _elm_code_widget2_font_size_get, ""),
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
#!/bin/sh
|
#!/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"
|
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"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue