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 | |
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 '')
-rw-r--r-- | src/extantz/ephysics_demo.c | 4 | ||||
-rw-r--r-- | src/extantz/extantz.c | 4 | ||||
-rw-r--r-- | src/extantz/files.c | 16 | ||||
-rw-r--r-- | src/extantz/scenri.c | 2 | ||||
-rw-r--r-- | src/extantz/woMan.c | 2 | ||||
-rw-r--r-- | src/libraries/winFang.c | 40 |
6 files changed, 34 insertions, 34 deletions
diff --git a/src/extantz/ephysics_demo.c b/src/extantz/ephysics_demo.c index a86cad2..23bc125 100644 --- a/src/extantz/ephysics_demo.c +++ b/src/extantz/ephysics_demo.c | |||
@@ -32,7 +32,7 @@ EPhysics_World *ephysicsAdd(globals *ourGlobals) | |||
32 | ephysics_body_friction_set(boundary, 0); | 32 | ephysics_body_friction_set(boundary, 0); |
33 | 33 | ||
34 | sprintf(buf, "%s/%s.edj", prefix_data_get(), EPHYSICS_TEST_THEME); | 34 | sprintf(buf, "%s/%s.edj", prefix_data_get(), EPHYSICS_TEST_THEME); |
35 | box1 = eo_add(ELM_OBJ_IMAGE_CLASS, ourGlobals->win, | 35 | box1 = eo_add(ELM_IMAGE_CLASS, ourGlobals->win, |
36 | elm_obj_image_file_set(buf, "blue-cube"), | 36 | elm_obj_image_file_set(buf, "blue-cube"), |
37 | evas_obj_size_set(70, 70), | 37 | evas_obj_size_set(70, 70), |
38 | evas_obj_position_set(ourGlobals->win_w / 2 - 80, ourGlobals->win_h - 200), | 38 | evas_obj_position_set(ourGlobals->win_w / 2 - 80, ourGlobals->win_h - 200), |
@@ -49,7 +49,7 @@ EPhysics_World *ephysicsAdd(globals *ourGlobals) | |||
49 | eo_unref(box1); | 49 | eo_unref(box1); |
50 | 50 | ||
51 | sprintf(buf, "%s/%s.edj", prefix_data_get(), EPHYSICS_TEST_THEME); | 51 | sprintf(buf, "%s/%s.edj", prefix_data_get(), EPHYSICS_TEST_THEME); |
52 | box2 = eo_add(ELM_OBJ_IMAGE_CLASS, ourGlobals->win, | 52 | box2 = eo_add(ELM_IMAGE_CLASS, ourGlobals->win, |
53 | elm_obj_image_file_set(buf, "purple-cube"), | 53 | elm_obj_image_file_set(buf, "purple-cube"), |
54 | evas_obj_size_set(70, 70), | 54 | evas_obj_size_set(70, 70), |
55 | evas_obj_position_set(ourGlobals->win_w / 2 + 10, ourGlobals->win_h - 200), | 55 | evas_obj_position_set(ourGlobals->win_w / 2 + 10, ourGlobals->win_h - 200), |
diff --git a/src/extantz/extantz.c b/src/extantz/extantz.c index 7c90b8a..98669ea 100644 --- a/src/extantz/extantz.c +++ b/src/extantz/extantz.c | |||
@@ -482,7 +482,7 @@ static void makeMainMenu(globals *ourGlobals) | |||
482 | Elm_Object_Item *tb_it; | 482 | Elm_Object_Item *tb_it; |
483 | 483 | ||
484 | // A toolbar thingy. | 484 | // A toolbar thingy. |
485 | tb = eo_add(ELM_OBJ_TOOLBAR_CLASS, ourGlobals->win, | 485 | tb = eo_add(ELM_TOOLBAR_CLASS, ourGlobals->win, |
486 | evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, 0.0), | 486 | evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, 0.0), |
487 | evas_obj_size_hint_align_set(EVAS_HINT_FILL, EVAS_HINT_FILL), | 487 | evas_obj_size_hint_align_set(EVAS_HINT_FILL, EVAS_HINT_FILL), |
488 | elm_obj_toolbar_shrink_mode_set(ELM_TOOLBAR_SHRINK_MENU), | 488 | elm_obj_toolbar_shrink_mode_set(ELM_TOOLBAR_SHRINK_MENU), |
@@ -670,7 +670,7 @@ EAPI_MAIN int elm_main(int argc, char **argv) | |||
670 | // Override the background image | 670 | // Override the background image |
671 | #if 1 | 671 | #if 1 |
672 | snprintf(buf, sizeof(buf), "%s/sky_03.jpg", prefix_data_get()); | 672 | snprintf(buf, sizeof(buf), "%s/sky_03.jpg", prefix_data_get()); |
673 | ourGlobals.mainWindow->bg = eo_add(ELM_OBJ_IMAGE_CLASS, ourGlobals.mainWindow->win, | 673 | ourGlobals.mainWindow->bg = eo_add(ELM_IMAGE_CLASS, ourGlobals.mainWindow->win, |
674 | evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), | 674 | evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), |
675 | elm_obj_image_fill_outside_set(EINA_TRUE), | 675 | elm_obj_image_fill_outside_set(EINA_TRUE), |
676 | elm_obj_image_file_set(buf, NULL), | 676 | elm_obj_image_file_set(buf, NULL), |
diff --git a/src/extantz/files.c b/src/extantz/files.c index 666842b..3d5d3d3 100644 --- a/src/extantz/files.c +++ b/src/extantz/files.c | |||
@@ -176,13 +176,13 @@ winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool sa | |||
176 | // Call back for double click or Enter pressed on file. | 176 | // Call back for double click or Enter pressed on file. |
177 | evas_object_smart_callback_add(fs, "activated", my_fileselector_activated, me); | 177 | evas_object_smart_callback_add(fs, "activated", my_fileselector_activated, me); |
178 | 178 | ||
179 | vbox = eo_add(ELM_OBJ_BOX_CLASS, me->win, | 179 | vbox = eo_add(ELM_BOX_CLASS, me->win, |
180 | elm_obj_box_homogeneous_set(EINA_FALSE), | 180 | elm_obj_box_homogeneous_set(EINA_FALSE), |
181 | elm_obj_box_horizontal_set(EINA_TRUE), | 181 | elm_obj_box_horizontal_set(EINA_TRUE), |
182 | evas_obj_size_hint_align_set(EVAS_HINT_FILL, EVAS_HINT_FILL) | 182 | evas_obj_size_hint_align_set(EVAS_HINT_FILL, EVAS_HINT_FILL) |
183 | ); | 183 | ); |
184 | 184 | ||
185 | hoversel = eo_add(ELM_OBJ_HOVERSEL_CLASS, vbox, | 185 | hoversel = eo_add(ELM_HOVERSEL_CLASS, vbox, |
186 | elm_obj_hoversel_hover_parent_set(me->win), | 186 | elm_obj_hoversel_hover_parent_set(me->win), |
187 | eo_key_data_set("fileselector", fs, NULL), | 187 | eo_key_data_set("fileselector", fs, NULL), |
188 | elm_obj_hoversel_item_add("name(asc)", NULL, ELM_ICON_NONE, _sort_selected_cb, (const void *) ELM_FILESELECTOR_SORT_BY_FILENAME_ASC), | 188 | elm_obj_hoversel_item_add("name(asc)", NULL, ELM_ICON_NONE, _sort_selected_cb, (const void *) ELM_FILESELECTOR_SORT_BY_FILENAME_ASC), |
@@ -199,7 +199,7 @@ winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool sa | |||
199 | elm_box_pack_end(vbox, hoversel); | 199 | elm_box_pack_end(vbox, hoversel); |
200 | eo_unref(hoversel); | 200 | eo_unref(hoversel); |
201 | 201 | ||
202 | hoversel = eo_add(ELM_OBJ_HOVERSEL_CLASS, vbox, | 202 | hoversel = eo_add(ELM_HOVERSEL_CLASS, vbox, |
203 | elm_obj_hoversel_hover_parent_set(me->win), | 203 | elm_obj_hoversel_hover_parent_set(me->win), |
204 | eo_key_data_set("fileselector", fs, NULL), | 204 | eo_key_data_set("fileselector", fs, NULL), |
205 | elm_obj_hoversel_item_add("tiny", NULL, ELM_ICON_NONE, _tiny_icon_clicked, fs), | 205 | elm_obj_hoversel_item_add("tiny", NULL, ELM_ICON_NONE, _tiny_icon_clicked, fs), |
@@ -215,7 +215,7 @@ winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool sa | |||
215 | eo_unref(hoversel); | 215 | eo_unref(hoversel); |
216 | 216 | ||
217 | 217 | ||
218 | bt = eo_add(ELM_OBJ_CHECK_CLASS, vbox, | 218 | bt = eo_add(ELM_CHECK_CLASS, vbox, |
219 | elm_obj_check_state_set(elm_fileselector_hidden_visible_get(fs)), | 219 | elm_obj_check_state_set(elm_fileselector_hidden_visible_get(fs)), |
220 | evas_obj_visibility_set(EINA_TRUE) | 220 | evas_obj_visibility_set(EINA_TRUE) |
221 | ); | 221 | ); |
@@ -224,7 +224,7 @@ winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool sa | |||
224 | elm_box_pack_end(vbox, bt); | 224 | elm_box_pack_end(vbox, bt); |
225 | eo_unref(bt); | 225 | eo_unref(bt); |
226 | 226 | ||
227 | rdg = rd = eo_add(ELM_OBJ_RADIO_CLASS, vbox, | 227 | rdg = rd = eo_add(ELM_RADIO_CLASS, vbox, |
228 | elm_obj_radio_state_value_set(ELM_FILESELECTOR_GRID), | 228 | elm_obj_radio_state_value_set(ELM_FILESELECTOR_GRID), |
229 | evas_obj_visibility_set(EINA_TRUE) | 229 | evas_obj_visibility_set(EINA_TRUE) |
230 | ); | 230 | ); |
@@ -235,7 +235,7 @@ winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool sa | |||
235 | _mode_changed_cb(fs, rd, NULL); | 235 | _mode_changed_cb(fs, rd, NULL); |
236 | eo_unref(rd); | 236 | eo_unref(rd); |
237 | 237 | ||
238 | rd = eo_add(ELM_OBJ_RADIO_CLASS, vbox, | 238 | rd = eo_add(ELM_RADIO_CLASS, vbox, |
239 | elm_obj_radio_state_value_set(ELM_FILESELECTOR_LIST), | 239 | elm_obj_radio_state_value_set(ELM_FILESELECTOR_LIST), |
240 | evas_obj_visibility_set(EINA_TRUE) | 240 | evas_obj_visibility_set(EINA_TRUE) |
241 | ); | 241 | ); |
@@ -247,7 +247,7 @@ winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool sa | |||
247 | // No need to unref this, it's taken care of already. | 247 | // No need to unref this, it's taken care of already. |
248 | //eo_unref(rdg); | 248 | //eo_unref(rdg); |
249 | 249 | ||
250 | bt = eo_add(ELM_OBJ_BUTTON_CLASS, me->win, | 250 | bt = eo_add(ELM_BUTTON_CLASS, me->win, |
251 | evas_obj_visibility_set(EINA_TRUE) | 251 | evas_obj_visibility_set(EINA_TRUE) |
252 | ); | 252 | ); |
253 | elm_object_text_set(bt, "OK"); | 253 | elm_object_text_set(bt, "OK"); |
@@ -255,7 +255,7 @@ winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool sa | |||
255 | elm_box_pack_end(vbox, bt); | 255 | elm_box_pack_end(vbox, bt); |
256 | eo_unref(bt); | 256 | eo_unref(bt); |
257 | 257 | ||
258 | bt = eo_add(ELM_OBJ_BUTTON_CLASS, me->win, | 258 | bt = eo_add(ELM_BUTTON_CLASS, me->win, |
259 | evas_obj_visibility_set(EINA_TRUE) | 259 | evas_obj_visibility_set(EINA_TRUE) |
260 | ); | 260 | ); |
261 | elm_object_text_set(bt, "CANCEL"); | 261 | elm_object_text_set(bt, "CANCEL"); |
diff --git a/src/extantz/scenri.c b/src/extantz/scenri.c index 2a02996..42a7987 100644 --- a/src/extantz/scenri.c +++ b/src/extantz/scenri.c | |||
@@ -373,7 +373,7 @@ Scene_Data *scenriAdd(Evas_Object *win) | |||
373 | // Any colour or texture applied to this window gets applied to the scene, including transparency. | 373 | // Any colour or texture applied to this window gets applied to the scene, including transparency. |
374 | // Interestingly enough, the position and size of the render seems to NOT depend on the position and size of this image? | 374 | // Interestingly enough, the position and size of the render seems to NOT depend on the position and size of this image? |
375 | // Note that we can't reuse the windows background image, Evas_3D needs both images. | 375 | // Note that we can't reuse the windows background image, Evas_3D needs both images. |
376 | scene->image = eo_add(ELM_OBJ_IMAGE_CLASS, win, | 376 | scene->image = eo_add(ELM_IMAGE_CLASS, win, |
377 | evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), | 377 | evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), |
378 | elm_obj_image_fill_outside_set(EINA_TRUE), | 378 | elm_obj_image_fill_outside_set(EINA_TRUE), |
379 | evas_obj_visibility_set(EINA_TRUE), | 379 | evas_obj_visibility_set(EINA_TRUE), |
diff --git a/src/extantz/woMan.c b/src/extantz/woMan.c index 09e7e2d..a6f6717 100644 --- a/src/extantz/woMan.c +++ b/src/extantz/woMan.c | |||
@@ -271,7 +271,7 @@ winFang *woMan_add(globals *ourGlobals) | |||
271 | tab = gridList; tab_it = elm_naviframe_item_push(nf, NULL, NULL, NULL, tab, NULL); elm_naviframe_item_title_enabled_set(tab_it, EINA_FALSE, EINA_TRUE); elm_toolbar_item_append(tb, NULL, "Grids", _promote, tab_it); | 271 | tab = gridList; tab_it = elm_naviframe_item_push(nf, NULL, NULL, NULL, tab, NULL); elm_naviframe_item_title_enabled_set(tab_it, EINA_FALSE, EINA_TRUE); elm_toolbar_item_append(tb, NULL, "Grids", _promote, tab_it); |
272 | elm_layout_box_append(me->win, WF_BOX, nf); | 272 | elm_layout_box_append(me->win, WF_BOX, nf); |
273 | 273 | ||
274 | bt = eo_add(ELM_OBJ_BUTTON_CLASS, me->win, | 274 | bt = eo_add(ELM_BUTTON_CLASS, me->win, |
275 | // evas_obj_text_set("Login"), | 275 | // evas_obj_text_set("Login"), |
276 | evas_obj_size_hint_align_set(EVAS_HINT_FILL, EVAS_HINT_FILL), | 276 | evas_obj_size_hint_align_set(EVAS_HINT_FILL, EVAS_HINT_FILL), |
277 | evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, 0.0), | 277 | evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, 0.0), |
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++) |