diff options
author | David Walter Seikel | 2014-06-11 20:09:33 +1000 |
---|---|---|
committer | David Walter Seikel | 2014-06-11 20:09:33 +1000 |
commit | d525e7e7a38bf4824e44a2bdc3e14175933a8588 (patch) | |
tree | c3b5f960b8295d5a239ddf8fb5852285372cbda8 /src/libraries | |
parent | Some notes on privacy. (diff) | |
download | SledjHamr-d525e7e7a38bf4824e44a2bdc3e14175933a8588.zip SledjHamr-d525e7e7a38bf4824e44a2bdc3e14175933a8588.tar.gz SledjHamr-d525e7e7a38bf4824e44a2bdc3e14175933a8588.tar.bz2 SledjHamr-d525e7e7a38bf4824e44a2bdc3e14175933a8588.tar.xz |
Update to post release API change. So much for stable API to collaborate with. sigh
Diffstat (limited to 'src/libraries')
-rw-r--r-- | src/libraries/winFang.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/libraries/winFang.c b/src/libraries/winFang.c index 9319a18..0176a1b 100644 --- a/src/libraries/winFang.c +++ b/src/libraries/winFang.c | |||
@@ -211,7 +211,7 @@ winFang *winFangAdd(winFang *parent, int x, int y, int w, int h, char *title, ch | |||
211 | } | 211 | } |
212 | 212 | ||
213 | snprintf(buf, sizeof(buf), "%s/winFang.edj", prefix_data_get()); | 213 | snprintf(buf, sizeof(buf), "%s/winFang.edj", prefix_data_get()); |
214 | result->layout = eo_add(ELM_OBJ_LAYOUT_CLASS, obj, | 214 | result->layout = eo_add(ELM_LAYOUT_CLASS, obj, |
215 | evas_obj_size_set(w, h), | 215 | evas_obj_size_set(w, h), |
216 | evas_obj_position_set(x, y), | 216 | evas_obj_position_set(x, y), |
217 | evas_obj_name_set(WF_LAYOUT), | 217 | evas_obj_name_set(WF_LAYOUT), |
@@ -229,7 +229,7 @@ winFang *winFangAdd(winFang *parent, int x, int y, int w, int h, char *title, ch | |||
229 | 229 | ||
230 | // Something to catch clicks on the background, for moving the window. | 230 | // Something to catch clicks on the background, for moving the window. |
231 | // Coz Elm is uncooperative with this sort of thing, so we need to stick in a rectangle. | 231 | // Coz Elm is uncooperative with this sort of thing, so we need to stick in a rectangle. |
232 | obj = eo_add(EVAS_OBJ_RECTANGLE_CLASS, result->layout, | 232 | obj = eo_add(EVAS_RECTANGLE_CLASS, result->layout, |
233 | evas_obj_size_hint_align_set(EVAS_HINT_FILL, EVAS_HINT_FILL), | 233 | evas_obj_size_hint_align_set(EVAS_HINT_FILL, EVAS_HINT_FILL), |
234 | evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), | 234 | evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), |
235 | evas_obj_name_set(WF_UNDERLAY), | 235 | evas_obj_name_set(WF_UNDERLAY), |
@@ -249,7 +249,7 @@ winFang *winFangAdd(winFang *parent, int x, int y, int w, int h, char *title, ch | |||
249 | if (i == 1) cx += result->w; | 249 | if (i == 1) cx += result->w; |
250 | else if (i == 2) {cx += result->w; cy += result->h;} | 250 | else if (i == 2) {cx += result->w; cy += result->h;} |
251 | else if (i == 3) cy += result->h; | 251 | else if (i == 3) cy += result->h; |
252 | result->hand[i] = eo_add(EVAS_OBJ_IMAGE_CLASS, result->e, | 252 | result->hand[i] = eo_add(EVAS_IMAGE_CLASS, result->e, |
253 | evas_obj_image_filled_set(EINA_TRUE), | 253 | evas_obj_image_filled_set(EINA_TRUE), |
254 | evas_obj_image_file_set(buf, NULL), | 254 | evas_obj_image_file_set(buf, NULL), |
255 | evas_obj_size_set(31, 31), | 255 | evas_obj_size_set(31, 31), |
@@ -260,7 +260,7 @@ winFang *winFangAdd(winFang *parent, int x, int y, int w, int h, char *title, ch | |||
260 | eo_unref(result->hand[i]); | 260 | eo_unref(result->hand[i]); |
261 | } | 261 | } |
262 | 262 | ||
263 | result->title = eo_add(ELM_OBJ_LABEL_CLASS, result->layout, | 263 | result->title = eo_add(ELM_LABEL_CLASS, result->layout, |
264 | evas_obj_size_hint_align_set(EVAS_HINT_FILL, EVAS_HINT_FILL), | 264 | evas_obj_size_hint_align_set(EVAS_HINT_FILL, EVAS_HINT_FILL), |
265 | evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), | 265 | evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), |
266 | evas_obj_visibility_set(EINA_TRUE) | 266 | evas_obj_visibility_set(EINA_TRUE) |
@@ -271,7 +271,7 @@ winFang *winFangAdd(winFang *parent, int x, int y, int w, int h, char *title, ch | |||
271 | eo_unref(result->title); | 271 | eo_unref(result->title); |
272 | } | 272 | } |
273 | 273 | ||
274 | result->grid = eo_add(ELM_OBJ_GRID_CLASS, result->layout, | 274 | result->grid = eo_add(ELM_GRID_CLASS, result->layout, |
275 | evas_obj_size_hint_align_set(EVAS_HINT_FILL, EVAS_HINT_FILL), | 275 | evas_obj_size_hint_align_set(EVAS_HINT_FILL, EVAS_HINT_FILL), |
276 | evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), | 276 | evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), |
277 | evas_obj_name_set(WF_SWALLOW), | 277 | evas_obj_name_set(WF_SWALLOW), |
@@ -373,21 +373,21 @@ Widget *widgetAdd(winFang *win, char *type , char *title, int x, int y, int w, i | |||
373 | if (NULL == widgetClasses[0].name) | 373 | if (NULL == widgetClasses[0].name) |
374 | { | 374 | { |
375 | i = 0; | 375 | i = 0; |
376 | widgetClasses[i].name = WT_CHECK; widgetClasses[i++].klass = ELM_OBJ_CHECK_CLASS; | 376 | widgetClasses[i].name = WT_CHECK; widgetClasses[i++].klass = ELM_CHECK_CLASS; |
377 | widgetClasses[i].name = WT_BOX; widgetClasses[i++].klass = ELM_OBJ_BOX_CLASS; | 377 | widgetClasses[i].name = WT_BOX; widgetClasses[i++].klass = ELM_BOX_CLASS; |
378 | widgetClasses[i].name = WT_BUTTON; widgetClasses[i++].klass = ELM_OBJ_BUTTON_CLASS; | 378 | widgetClasses[i].name = WT_BUTTON; widgetClasses[i++].klass = ELM_BUTTON_CLASS; |
379 | widgetClasses[i].name = WT_ENTRY; widgetClasses[i++].klass = ELM_OBJ_ENTRY_CLASS; | 379 | widgetClasses[i].name = WT_ENTRY; widgetClasses[i++].klass = ELM_ENTRY_CLASS; |
380 | widgetClasses[i].name = WT_FILES; widgetClasses[i++].klass = ELM_OBJ_FILESELECTOR_CLASS; | 380 | widgetClasses[i].name = WT_FILES; widgetClasses[i++].klass = ELM_FILESELECTOR_CLASS; |
381 | widgetClasses[i].name = WT_GRID; widgetClasses[i++].klass = ELM_OBJ_GRID_CLASS; | 381 | widgetClasses[i].name = WT_GRID; widgetClasses[i++].klass = ELM_GRID_CLASS; |
382 | widgetClasses[i].name = WT_HOVER; widgetClasses[i++].klass = ELM_OBJ_HOVERSEL_CLASS; | 382 | widgetClasses[i].name = WT_HOVER; widgetClasses[i++].klass = ELM_HOVERSEL_CLASS; |
383 | widgetClasses[i].name = WT_IMAGE; widgetClasses[i++].klass = ELM_OBJ_IMAGE_CLASS; | 383 | widgetClasses[i].name = WT_IMAGE; widgetClasses[i++].klass = ELM_IMAGE_CLASS; |
384 | widgetClasses[i].name = WT_LABEL; widgetClasses[i++].klass = ELM_OBJ_LABEL_CLASS; | 384 | widgetClasses[i].name = WT_LABEL; widgetClasses[i++].klass = ELM_LABEL_CLASS; |
385 | widgetClasses[i].name = WT_LAYOUT; widgetClasses[i++].klass = ELM_OBJ_LAYOUT_CLASS; | 385 | widgetClasses[i].name = WT_LAYOUT; widgetClasses[i++].klass = ELM_LAYOUT_CLASS; |
386 | widgetClasses[i].name = WT_RADIO; widgetClasses[i++].klass = ELM_OBJ_RADIO_CLASS; | 386 | widgetClasses[i].name = WT_RADIO; widgetClasses[i++].klass = ELM_RADIO_CLASS; |
387 | widgetClasses[i].name = WT_RECT; widgetClasses[i++].klass = EVAS_OBJ_RECTANGLE_CLASS; | 387 | widgetClasses[i].name = WT_RECT; widgetClasses[i++].klass = EVAS_RECTANGLE_CLASS; |
388 | widgetClasses[i].name = WT_TEXT; widgetClasses[i++].klass = EVAS_OBJ_TEXT_CLASS; | 388 | widgetClasses[i].name = WT_TEXT; widgetClasses[i++].klass = EVAS_TEXT_CLASS; |
389 | widgetClasses[i].name = WT_TEXTBOX; widgetClasses[i++].klass = ELM_OBJ_ENTRY_CLASS; | 389 | widgetClasses[i].name = WT_TEXTBOX; widgetClasses[i++].klass = ELM_ENTRY_CLASS; |
390 | widgetClasses[i].name = WT_TOOLBAR; widgetClasses[i++].klass = ELM_OBJ_TOOLBAR_CLASS; | 390 | widgetClasses[i].name = WT_TOOLBAR; widgetClasses[i++].klass = ELM_TOOLBAR_CLASS; |
391 | } | 391 | } |
392 | 392 | ||
393 | for (i = 0; i < ARRAY_LENGTH(widgetClasses); i++) | 393 | for (i = 0; i < ARRAY_LENGTH(widgetClasses); i++) |