From cb2d0546d4fc14310ecd652141fdb34b3289c428 Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Tue, 1 Sep 2009 16:58:22 +0000 Subject: [PATCH] More API Inconsistency fixes. SVN revision: 42165 --- src/bin/e_table.c | 4 ++-- src/bin/e_table.h | 4 ++-- src/bin/e_widget_frametable.c | 2 +- src/bin/e_widget_table.c | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/bin/e_table.c b/src/bin/e_table.c index c069a2346..a0c60bb08 100644 --- a/src/bin/e_table.c +++ b/src/bin/e_table.c @@ -176,7 +176,7 @@ e_table_col_row_size_get(Evas_Object *obj, int *cols, int *rows) } EAPI void -e_table_min_size_get(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh) +e_table_size_min_get(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh) { E_Smart_Data *sd; @@ -187,7 +187,7 @@ e_table_min_size_get(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh) } EAPI void -e_table_max_size_get(Evas_Object *obj, Evas_Coord *maxw, Evas_Coord *maxh) +e_table_size_max_get(Evas_Object *obj, Evas_Coord *maxw, Evas_Coord *maxh) { E_Smart_Data *sd; diff --git a/src/bin/e_table.h b/src/bin/e_table.h index add27eac9..0371ffd5a 100644 --- a/src/bin/e_table.h +++ b/src/bin/e_table.h @@ -14,8 +14,8 @@ EAPI void e_table_pack (Evas_Object *obj, Evas_Object *chil EAPI void e_table_pack_options_set (Evas_Object *obj, int fill_w, int fill_h, int expand_w, int expand_h, double align_x, double align_y, Evas_Coord min_w, Evas_Coord min_h, Evas_Coord max_w, Evas_Coord max_h); EAPI void e_table_unpack (Evas_Object *obj); EAPI void e_table_col_row_size_get (Evas_Object *obj, int *cols, int *rows); -EAPI void e_table_min_size_get (Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh); -EAPI void e_table_max_size_get (Evas_Object *obj, Evas_Coord *maxw, Evas_Coord *maxh); +EAPI void e_table_size_min_get (Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh); +EAPI void e_table_size_max_get (Evas_Object *obj, Evas_Coord *maxw, Evas_Coord *maxh); EAPI void e_table_align_get (Evas_Object *obj, double *ax, double *ay); EAPI void e_table_align_set (Evas_Object *obj, double ax, double ay); diff --git a/src/bin/e_widget_frametable.c b/src/bin/e_widget_frametable.c index 0b30c9160..6aac5da7d 100644 --- a/src/bin/e_widget_frametable.c +++ b/src/bin/e_widget_frametable.c @@ -68,7 +68,7 @@ e_widget_frametable_object_append(Evas_Object *obj, Evas_Object *sobj, int col, mw, mh, /* min */ 99999, 99999 /* max */ ); - e_table_min_size_get(wd->o_table, &mw, &mh); + e_table_size_min_get(wd->o_table, &mw, &mh); edje_extern_object_min_size_set(wd->o_table, mw, mh); edje_object_part_swallow(wd->o_frame, "e.swallow.content", wd->o_table); edje_object_size_min_calc(wd->o_frame, &mw, &mh); diff --git a/src/bin/e_widget_table.c b/src/bin/e_widget_table.c index a27ede5db..0e18d75d3 100644 --- a/src/bin/e_widget_table.c +++ b/src/bin/e_widget_table.c @@ -62,7 +62,7 @@ e_widget_table_object_align_append(Evas_Object *obj, Evas_Object *sobj, int col, mw, mh, /* min */ 99999, 99999 /* max */ ); - e_table_min_size_get(wd->o_table, &mw, &mh); + e_table_size_min_get(wd->o_table, &mw, &mh); e_widget_size_min_set(obj, mw, mh); e_widget_sub_object_add(obj, sobj); evas_object_show(sobj); @@ -86,7 +86,7 @@ e_widget_table_object_repack(Evas_Object *obj, Evas_Object *sobj, int col, int r mw, mh, /* min */ 99999, 99999 /* max */ ); - e_table_min_size_get(wd->o_table, &mw, &mh); + e_table_size_min_get(wd->o_table, &mw, &mh); e_widget_size_min_set(obj, mw, mh); }