summaryrefslogtreecommitdiff
path: root/src/lib/evas/canvas/evas_object_grid.c
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2018-02-14 21:14:52 -0500
committerMike Blumenkrantz <zmike@osg.samsung.com>2018-02-15 13:11:00 -0500
commitf19da9b4a8d0b2271d7e58e88c48830bc3586b86 (patch)
tree929ab9a3fe67ab33e0a5bf5731c4a447ed1a9d5d /src/lib/evas/canvas/evas_object_grid.c
parent2caaf09ea2545a85b92e8c4ac71c678b90b9cdd8 (diff)
evas_grid: size -> grid_size
this conflicted with efl_ui_base.size
Diffstat (limited to 'src/lib/evas/canvas/evas_object_grid.c')
-rw-r--r--src/lib/evas/canvas/evas_object_grid.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/evas/canvas/evas_object_grid.c b/src/lib/evas/canvas/evas_object_grid.c
index 5c4cda9..fccc135 100644
--- a/src/lib/evas/canvas/evas_object_grid.c
+++ b/src/lib/evas/canvas/evas_object_grid.c
@@ -302,7 +302,7 @@ _evas_grid_add_to(Eo *parent, Evas_Grid_Data *_pd EINA_UNUSED)
302} 302}
303 303
304EOLIAN static void 304EOLIAN static void
305_evas_grid_size_set(Eo *o, Evas_Grid_Data *priv, int w, int h) 305_evas_grid_grid_size_set(Eo *o, Evas_Grid_Data *priv, int w, int h)
306{ 306{
307 if ((priv->size.w == w) && (priv->size.h == h)) return; 307 if ((priv->size.w == w) && (priv->size.h == h)) return;
308 priv->size.w = w; 308 priv->size.w = w;
@@ -311,7 +311,7 @@ _evas_grid_size_set(Eo *o, Evas_Grid_Data *priv, int w, int h)
311} 311}
312 312
313EOLIAN static void 313EOLIAN static void
314_evas_grid_size_get(Eo *o EINA_UNUSED, Evas_Grid_Data *priv, int *w, int *h) 314_evas_grid_grid_size_get(Eo *o EINA_UNUSED, Evas_Grid_Data *priv, int *w, int *h)
315{ 315{
316 if (w) *w = priv->size.w; 316 if (w) *w = priv->size.w;
317 if (h) *h = priv->size.h; 317 if (h) *h = priv->size.h;