enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

rename WEIGHT/ALIGN/EXPAND/FILL to E_WEIGHT/E_ALIGN/E_EXPAND/E_FILL 

Otherwise there were macro clashes with a systemwide include.
Also remove a leftover E_Hal.h include.
This commit is contained in:
q66 2014-11-21 20:10:46 +00:00
parent 3036de64bc
commit d12ef91687
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/bin/e.h
View File

@ -263,10 +263,10 @@ typedef struct _E_Rect E_Rect;
} \
}
#define WEIGHT evas_object_size_hint_weight_set
#define ALIGN evas_object_size_hint_align_set
#define EXPAND(X) WEIGHT((X), EVAS_HINT_EXPAND, EVAS_HINT_EXPAND)
#define FILL(X) ALIGN((X), EVAS_HINT_FILL, EVAS_HINT_FILL)
#define E_WEIGHT evas_object_size_hint_weight_set
#define E_ALIGN evas_object_size_hint_align_set
#define E_EXPAND(X) E_WEIGHT((X), EVAS_HINT_EXPAND, EVAS_HINT_EXPAND)
#define E_FILL(X) E_ALIGN((X), EVAS_HINT_FILL, EVAS_HINT_FILL)
# define E_REMOTE_OPTIONS 1
# define E_REMOTE_OUT 2

4
src/bin/e_dialog.c
View File

@ -36,8 +36,8 @@ _e_dialog_internal_new(Evas_Object *parent, const char *name, const char *class,
evas_object_event_callback_add(dia->win, EVAS_CALLBACK_DEL, _e_dialog_cb_delete, dia);
ecore_evas_name_class_set(ecore_evas_ecore_evas_get(e), name, class);
dia->bg_object = o = edje_object_add(evas_object_evas_get(dia->win));
EXPAND(o);
FILL(o);
E_EXPAND(o);
E_FILL(o);
elm_win_resize_object_add(dia->win, o);
e_theme_edje_object_set(o, "base/theme/dialog",
"e/widgets/dialog/main");

4
src/modules/everything/evry.c
View File

@ -768,8 +768,8 @@ _evry_window_new(E_Zone *zone, E_Zone_Edge edge)
o = edje_object_add(win->evas);
win->o_main = o;
elm_win_resize_object_add(win->ewin, o);
EXPAND(o);
FILL(o);
E_EXPAND(o);
E_FILL(o);
e_theme_edje_object_set(o, "base/theme/modules/everything",
"e/modules/everything/main");

2
src/modules/temperature/e_mod_main.h
View File

@ -5,8 +5,6 @@
#ifdef HAVE_EEZE
# include <Eeze.h>
#else
# include <E_Hal.h>
#endif