Merge branch 'master' into devs/ajwillia-ms/elm_code

This commit is contained in:
Andy Williams 2015-02-27 15:13:06 +00:00
commit 8517f47124
1 changed files with 5 additions and 3 deletions

View File

@ -32,12 +32,14 @@ Eina_Unicode status_icons[] = {
0 0
}; };
#define EO_CONSTRUCTOR_CHECK_RETURN(obj) \ #define EO_CONSTRUCTOR_CHECK_RETURN(obj) do { \
if (eo_do(obj, eo_finalized_get())) \ Eina_Bool finalized; \
if (eo_do_ret(obj, finalized, eo_finalized_get())) \
{ \ { \
ERR("This function is only allowed during construction."); \ ERR("This function is only allowed during construction."); \
return; \ return; \
} } \
} while (0)
EOLIAN static void EOLIAN static void
_elm_code_widget_eo_base_constructor(Eo *obj, Elm_Code_Widget_Data *pd) _elm_code_widget_eo_base_constructor(Eo *obj, Elm_Code_Widget_Data *pd)