summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2011-12-30 10:02:19 +0000
committerCarsten Haitzler <raster@rasterman.com>2011-12-30 10:02:19 +0000
commit920f38eca236ba2a30765f058ff5dee860e06345 (patch)
tree133d9f72926cd7396f6266590b560dc3034898c1 /src
parent4c123a575c2a5e584e709a27d439bcfa50923829 (diff)
stop using deprecated calls.
SVN revision: 66681
Diffstat (limited to 'src')
-rw-r--r--src/bin/config.c4
-rw-r--r--src/bin/test_calendar.c2
-rw-r--r--src/bin/test_cnp.c4
-rw-r--r--src/bin/test_conform.c12
-rw-r--r--src/bin/test_cursor.c2
-rw-r--r--src/bin/test_entry.c52
-rw-r--r--src/bin/test_fileselector_button.c2
-rw-r--r--src/bin/test_fileselector_entry.c2
-rw-r--r--src/bin/test_flip.c2
-rw-r--r--src/bin/test_focus.c2
-rw-r--r--src/bin/test_focus2.c4
-rw-r--r--src/bin/test_focus3.c4
-rw-r--r--src/bin/test_genlist.c2
-rw-r--r--src/bin/test_gesture_layer.c2
-rw-r--r--src/bin/test_grid.c4
-rw-r--r--src/bin/test_index.c4
-rw-r--r--src/bin/test_list.c2
-rw-r--r--src/bin/test_tooltip.c2
-rw-r--r--src/bin/test_weather.c4
-rw-r--r--src/bin/test_web.c2
-rw-r--r--src/bin/test_win_inline.c4
-rw-r--r--src/edje_externals/elm_entry.c6
-rw-r--r--src/examples/conformant_example_01.c2
-rw-r--r--src/examples/conformant_example_02.c2
-rw-r--r--src/examples/fileselector_button_example.c2
-rw-r--r--src/lib/elc_anchorblock.c6
-rw-r--r--src/lib/elc_anchorview.c6
-rw-r--r--src/lib/elc_fileselector.c14
-rw-r--r--src/lib/elc_fileselector_entry.c8
-rw-r--r--src/lib/elc_multibuttonentry.c10
-rw-r--r--src/lib/elc_scrolled_entry.c4
-rw-r--r--src/lib/elm_entry.c29
-rw-r--r--src/lib/elm_spinner.c4
33 files changed, 107 insertions, 104 deletions
diff --git a/src/bin/config.c b/src/bin/config.c
index 865aa00f8..7ef90c7e7 100644
--- a/src/bin/config.c
+++ b/src/bin/config.c
@@ -2182,10 +2182,10 @@ _profiles_list_selected_cb(void *data,
2182 2182
2183 en = evas_object_data_get(obj, "prof_desc_entry"); 2183 en = evas_object_data_get(obj, "prof_desc_entry");
2184#ifdef ELM_EFREET 2184#ifdef ELM_EFREET
2185 if (desk) elm_entry_entry_set(en, desk->comment); 2185 if (desk) elm_object_text_set(en, desk->comment);
2186 else 2186 else
2187#endif 2187#endif
2188 elm_entry_entry_set(en, "Unknown"); 2188 elm_object_text_set(en, "Unknown");
2189 2189
2190#ifdef ELM_EFREET 2190#ifdef ELM_EFREET
2191 if (desk) efreet_desktop_free(desk); 2191 if (desk) efreet_desktop_free(desk);
diff --git a/src/bin/test_calendar.c b/src/bin/test_calendar.c
index bf09470a6..7d235c871 100644
--- a/src/bin/test_calendar.c
+++ b/src/bin/test_calendar.c
@@ -53,7 +53,7 @@ _print_cal_info(Evas_Object *cal, Evas_Object *en)
53 interval, year_min, year_max, sel_enabled, 53 interval, year_min, year_max, sel_enabled,
54 wds[0], wds[1], wds[2], wds[3], wds[4], wds[5], wds[6]); 54 wds[0], wds[1], wds[2], wds[3], wds[4], wds[5], wds[6]);
55 55
56 elm_entry_entry_set(en, info); 56 elm_object_text_set(en, info);
57} 57}
58 58
59static void 59static void
diff --git a/src/bin/test_cnp.c b/src/bin/test_cnp.c
index f0408c1b2..a8374de5d 100644
--- a/src/bin/test_cnp.c
+++ b/src/bin/test_cnp.c
@@ -47,7 +47,7 @@ test_cnp(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __
47 elm_entry_line_wrap_set(en, ELM_WRAP_CHAR); 47 elm_entry_line_wrap_set(en, ELM_WRAP_CHAR);
48 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 48 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
49 evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL); 49 evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL);
50 elm_entry_entry_set(en, 50 elm_object_text_set(en,
51 "Elementary provides " 51 "Elementary provides "
52 ); 52 );
53 elm_grid_pack(gd, en, 10, 10, 60, 40); 53 elm_grid_pack(gd, en, 10, 10, 60, 40);
@@ -64,7 +64,7 @@ test_cnp(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __
64 elm_entry_line_wrap_set(en, ELM_WRAP_CHAR); 64 elm_entry_line_wrap_set(en, ELM_WRAP_CHAR);
65 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 65 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
66 evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL); 66 evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL);
67 elm_entry_entry_set(en, 67 elm_object_text_set(en,
68 "rich copying and pasting functionality," 68 "rich copying and pasting functionality,"
69 ); 69 );
70 elm_grid_pack(gd, en, 10, 50, 60, 40); 70 elm_grid_pack(gd, en, 10, 50, 60, 40);
diff --git a/src/bin/test_conform.c b/src/bin/test_conform.c
index a0dd3f684..899aaf294 100644
--- a/src/bin/test_conform.c
+++ b/src/bin/test_conform.c
@@ -32,7 +32,7 @@ test_conformant(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event
32 elm_entry_scrollable_set(en, EINA_TRUE); 32 elm_entry_scrollable_set(en, EINA_TRUE);
33 elm_entry_single_line_set(en, 1); 33 elm_entry_single_line_set(en, 1);
34 elm_entry_bounce_set(en, 1, 0); 34 elm_entry_bounce_set(en, 1, 0);
35 elm_entry_entry_set(en, "This is the top entry here"); 35 elm_object_text_set(en, "This is the top entry here");
36 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0); 36 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0);
37 evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5); 37 evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5);
38 evas_object_show(en); 38 evas_object_show(en);
@@ -49,7 +49,7 @@ test_conformant(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event
49 elm_entry_scrollable_set(en, EINA_TRUE); 49 elm_entry_scrollable_set(en, EINA_TRUE);
50 elm_entry_single_line_set(en, 1); 50 elm_entry_single_line_set(en, 1);
51 elm_entry_bounce_set(en, 1, 0); 51 elm_entry_bounce_set(en, 1, 0);
52 elm_entry_entry_set(en, "This is the middle entry here"); 52 elm_object_text_set(en, "This is the middle entry here");
53 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0); 53 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0);
54 evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5); 54 evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5);
55 evas_object_show(en); 55 evas_object_show(en);
@@ -65,7 +65,7 @@ test_conformant(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event
65 en = elm_entry_add(win); 65 en = elm_entry_add(win);
66 elm_entry_scrollable_set(en, EINA_TRUE); 66 elm_entry_scrollable_set(en, EINA_TRUE);
67 elm_entry_bounce_set(en, 0, 1); 67 elm_entry_bounce_set(en, 0, 1);
68 elm_entry_entry_set(en, 68 elm_object_text_set(en,
69 "This is a multi-line entry at the bottom<br/>" 69 "This is a multi-line entry at the bottom<br/>"
70 "This can contain more than 1 line of text and be " 70 "This can contain more than 1 line of text and be "
71 "scrolled around to allow for entering of lots of " 71 "scrolled around to allow for entering of lots of "
@@ -118,7 +118,7 @@ test_conformant2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event
118 elm_entry_scrollable_set(en, EINA_TRUE); 118 elm_entry_scrollable_set(en, EINA_TRUE);
119 elm_entry_single_line_set(en, 1); 119 elm_entry_single_line_set(en, 1);
120 elm_entry_bounce_set(en, 1, 0); 120 elm_entry_bounce_set(en, 1, 0);
121 elm_entry_entry_set(en, "This is the top entry here"); 121 elm_object_text_set(en, "This is the top entry here");
122 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0); 122 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0);
123 evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5); 123 evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5);
124 elm_box_pack_end(bx, en); 124 elm_box_pack_end(bx, en);
@@ -153,7 +153,7 @@ test_conformant2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event
153 en = elm_entry_add(win); 153 en = elm_entry_add(win);
154 elm_entry_scrollable_set(en, EINA_TRUE); 154 elm_entry_scrollable_set(en, EINA_TRUE);
155 elm_entry_bounce_set(en, 0, 1); 155 elm_entry_bounce_set(en, 0, 1);
156 elm_entry_entry_set(en, "This entry and button below get deleted."); 156 elm_object_text_set(en, "This entry and button below get deleted.");
157 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 157 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
158 evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL); 158 evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL);
159 evas_object_show(en); 159 evas_object_show(en);
@@ -185,7 +185,7 @@ test_conformant2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event
185 en = elm_entry_add(win); 185 en = elm_entry_add(win);
186 elm_entry_scrollable_set(en, EINA_TRUE); 186 elm_entry_scrollable_set(en, EINA_TRUE);
187 elm_entry_bounce_set(en, 0, 1); 187 elm_entry_bounce_set(en, 0, 1);
188 elm_entry_entry_set(en, "This entry and button below get deleted."); 188 elm_object_text_set(en, "This entry and button below get deleted.");
189 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 189 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
190 evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL); 190 evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL);
191 evas_object_show(en); 191 evas_object_show(en);
diff --git a/src/bin/test_cursor.c b/src/bin/test_cursor.c
index 19a6c06df..b3b9102c4 100644
--- a/src/bin/test_cursor.c
+++ b/src/bin/test_cursor.c
@@ -148,7 +148,7 @@ test_cursor(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
148 148
149 entry = elm_entry_add(win); 149 entry = elm_entry_add(win);
150 elm_entry_scrollable_set(entry, EINA_TRUE); 150 elm_entry_scrollable_set(entry, EINA_TRUE);
151 elm_entry_entry_set(entry, "Xterm cursor"); 151 elm_object_text_set(entry, "Xterm cursor");
152 elm_entry_single_line_set(entry, EINA_TRUE); 152 elm_entry_single_line_set(entry, EINA_TRUE);
153 evas_object_size_hint_weight_set(entry, EVAS_HINT_EXPAND, 0); 153 evas_object_size_hint_weight_set(entry, EVAS_HINT_EXPAND, 0);
154 evas_object_size_hint_fill_set(entry, EVAS_HINT_FILL, EVAS_HINT_FILL); 154 evas_object_size_hint_fill_set(entry, EVAS_HINT_FILL, EVAS_HINT_FILL);
diff --git a/src/bin/test_entry.c b/src/bin/test_entry.c
index 5266fde17..03070aba7 100644
--- a/src/bin/test_entry.c
+++ b/src/bin/test_entry.c
@@ -7,14 +7,14 @@ static void
7my_entry_bt_1(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 7my_entry_bt_1(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
8{ 8{
9 Evas_Object *en = data; 9 Evas_Object *en = data;
10 elm_entry_entry_set(en, ""); 10 elm_object_text_set(en, "");
11} 11}
12 12
13static void 13static void
14my_entry_bt_2(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 14my_entry_bt_2(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
15{ 15{
16 Evas_Object *en = data; 16 Evas_Object *en = data;
17 const char *s = elm_entry_entry_get(en); 17 const char *s = elm_object_text_get(en);
18 printf("ENTRY:\n"); 18 printf("ENTRY:\n");
19 if (s) printf("%s\n", s); 19 if (s) printf("%s\n", s);
20 printf("ENTRY PLAIN UTF8:\n"); 20 printf("ENTRY PLAIN UTF8:\n");
@@ -127,7 +127,7 @@ test_entry(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
127 " ... end." 127 " ... end."
128 , elm_app_data_dir_get() 128 , elm_app_data_dir_get()
129 ); 129 );
130 elm_entry_entry_set(en, buf); 130 elm_object_text_set(en, buf);
131 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 131 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
132 evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL); 132 evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL);
133 elm_box_pack_end(bx, en); 133 elm_box_pack_end(bx, en);
@@ -209,14 +209,14 @@ static void
209my_scrolled_entry_bt_1(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 209my_scrolled_entry_bt_1(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
210{ 210{
211 Evas_Object *en = data; 211 Evas_Object *en = data;
212 elm_entry_entry_set(en, ""); 212 elm_object_text_set(en, "");
213} 213}
214 214
215static void 215static void
216my_scrolled_entry_bt_2(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 216my_scrolled_entry_bt_2(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
217{ 217{
218 Evas_Object *en = data; 218 Evas_Object *en = data;
219 const char *s = elm_entry_entry_get(en); 219 const char *s = elm_object_text_get(en);
220 printf("ENTRY:\n"); 220 printf("ENTRY:\n");
221 if (s) printf("%s\n", s); 221 if (s) printf("%s\n", s);
222 printf("ENTRY PLAIN UTF8:\n"); 222 printf("ENTRY PLAIN UTF8:\n");
@@ -261,7 +261,7 @@ static void
261my_scrolled_entry_bt_5(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 261my_scrolled_entry_bt_5(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
262{ 262{
263 Evas_Object *en = data; 263 Evas_Object *en = data;
264 const char *s = elm_entry_entry_get(en); 264 const char *s = elm_object_text_get(en);
265 printf("PASSWORD: '%s'\n", s ? s : ""); 265 printf("PASSWORD: '%s'\n", s ? s : "");
266} 266}
267 267
@@ -299,7 +299,7 @@ test_entry_scrolled(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *ev
299 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0); 299 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0);
300 evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5); 300 evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5);
301 elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF); 301 elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
302 elm_entry_entry_set(en, "Disabled entry"); 302 elm_object_text_set(en, "Disabled entry");
303 elm_entry_single_line_set(en, 1); 303 elm_entry_single_line_set(en, 1);
304 elm_object_disabled_set(en, 1); 304 elm_object_disabled_set(en, 1);
305 evas_object_show(en); 305 evas_object_show(en);
@@ -313,7 +313,7 @@ test_entry_scrolled(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *ev
313 elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF); 313 elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
314 elm_entry_password_set(en, 1); 314 elm_entry_password_set(en, 1);
315 elm_entry_single_line_set(en, 1); 315 elm_entry_single_line_set(en, 1);
316 elm_entry_entry_set(en, "Access denied, give up!"); 316 elm_object_text_set(en, "Access denied, give up!");
317 elm_object_disabled_set(en, 1); 317 elm_object_disabled_set(en, 1);
318 evas_object_show(en); 318 evas_object_show(en);
319 elm_box_pack_end(bx, en); 319 elm_box_pack_end(bx, en);
@@ -327,7 +327,7 @@ test_entry_scrolled(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *ev
327 elm_object_disabled_set(en, 1); 327 elm_object_disabled_set(en, 1);
328 elm_entry_context_menu_item_add(en, "Hello", NULL, ELM_ICON_NONE, NULL, NULL); 328 elm_entry_context_menu_item_add(en, "Hello", NULL, ELM_ICON_NONE, NULL, NULL);
329 elm_entry_context_menu_item_add(en, "World", NULL, ELM_ICON_NONE, NULL, NULL); 329 elm_entry_context_menu_item_add(en, "World", NULL, ELM_ICON_NONE, NULL, NULL);
330 elm_entry_entry_set(en, 330 elm_object_text_set(en,
331 "Multi-line disabled entry widget :)<br/>" 331 "Multi-line disabled entry widget :)<br/>"
332 "We can use markup <b>like this</> for styling and<br/>" 332 "We can use markup <b>like this</> for styling and<br/>"
333 "formatting <em>like this</>, as well as<br/>" 333 "formatting <em>like this</>, as well as<br/>"
@@ -346,7 +346,7 @@ test_entry_scrolled(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *ev
346 elm_entry_scrollable_set(en, EINA_TRUE); 346 elm_entry_scrollable_set(en, EINA_TRUE);
347 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0); 347 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0);
348 evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5); 348 evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5);
349 elm_entry_entry_set(en, "This is a single line"); 349 elm_object_text_set(en, "This is a single line");
350 elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF); 350 elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
351 elm_entry_single_line_set(en, 1); 351 elm_entry_single_line_set(en, 1);
352 elm_entry_select_all(en); 352 elm_entry_select_all(en);
@@ -358,7 +358,7 @@ test_entry_scrolled(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *ev
358 elm_entry_scrollable_set(en, EINA_TRUE); 358 elm_entry_scrollable_set(en, EINA_TRUE);
359 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0); 359 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0);
360 evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5); 360 evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5);
361 elm_entry_entry_set(en, "01234"); 361 elm_object_text_set(en, "01234");
362 elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF); 362 elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
363 elm_entry_single_line_set(en, 1); 363 elm_entry_single_line_set(en, 1);
364 evas_object_show(en); 364 evas_object_show(en);
@@ -373,7 +373,7 @@ test_entry_scrolled(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *ev
373 elm_entry_scrollable_set(en, EINA_TRUE); 373 elm_entry_scrollable_set(en, EINA_TRUE);
374 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0); 374 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0);
375 evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5); 375 evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5);
376 elm_entry_entry_set(en, "No numbers here"); 376 elm_object_text_set(en, "No numbers here");
377 elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF); 377 elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
378 elm_entry_single_line_set(en, 1); 378 elm_entry_single_line_set(en, 1);
379 evas_object_show(en); 379 evas_object_show(en);
@@ -388,7 +388,7 @@ test_entry_scrolled(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *ev
388 elm_entry_scrollable_set(en, EINA_TRUE); 388 elm_entry_scrollable_set(en, EINA_TRUE);
389 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0); 389 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0);
390 evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5); 390 evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5);
391 elm_entry_entry_set(en, "Just 20 chars"); 391 elm_object_text_set(en, "Just 20 chars");
392 elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF); 392 elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
393 elm_entry_single_line_set(en, 1); 393 elm_entry_single_line_set(en, 1);
394 evas_object_show(en); 394 evas_object_show(en);
@@ -403,7 +403,7 @@ test_entry_scrolled(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *ev
403 elm_entry_scrollable_set(en, EINA_TRUE); 403 elm_entry_scrollable_set(en, EINA_TRUE);
404 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0); 404 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0);
405 evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5); 405 evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5);
406 elm_entry_entry_set(en, "And now only 30 bytes"); 406 elm_object_text_set(en, "And now only 30 bytes");
407 elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF); 407 elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
408 elm_entry_single_line_set(en, 1); 408 elm_entry_single_line_set(en, 1);
409 evas_object_show(en); 409 evas_object_show(en);
@@ -419,7 +419,7 @@ test_entry_scrolled(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *ev
419 evas_object_size_hint_weight_set(en_p, EVAS_HINT_EXPAND, 0.0); 419 evas_object_size_hint_weight_set(en_p, EVAS_HINT_EXPAND, 0.0);
420 evas_object_size_hint_align_set(en_p, EVAS_HINT_FILL, 0.5); 420 evas_object_size_hint_align_set(en_p, EVAS_HINT_FILL, 0.5);
421 elm_entry_scrollbar_policy_set(en_p, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF); 421 elm_entry_scrollbar_policy_set(en_p, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
422 elm_entry_entry_set(en_p, "Password here"); 422 elm_object_text_set(en_p, "Password here");
423 elm_entry_single_line_set(en_p, 1); 423 elm_entry_single_line_set(en_p, 1);
424 elm_entry_password_set(en_p, 1); 424 elm_entry_password_set(en_p, 1);
425 evas_object_show(en_p); 425 evas_object_show(en_p);
@@ -444,7 +444,7 @@ test_entry_scrolled(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *ev
444 evas_object_size_hint_min_set(bt, 48, 48); 444 evas_object_size_hint_min_set(bt, 48, 48);
445 evas_object_show(bt); 445 evas_object_show(bt);
446 elm_entry_end_set(en, bt); 446 elm_entry_end_set(en, bt);
447 elm_entry_entry_set(en, "scrolled entry with icon and end objects"); 447 elm_object_text_set(en, "scrolled entry with icon and end objects");
448 evas_object_show(en); 448 evas_object_show(en);
449 elm_box_pack_end(bx, en); 449 elm_box_pack_end(bx, en);
450 450
@@ -454,7 +454,7 @@ test_entry_scrolled(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *ev
454 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 454 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
455 evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL); 455 evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL);
456 elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_ON, ELM_SCROLLER_POLICY_ON); 456 elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_ON, ELM_SCROLLER_POLICY_ON);
457 elm_entry_entry_set(en, 457 elm_object_text_set(en,
458 "This is an entry widget in this window that<br/>" 458 "This is an entry widget in this window that<br/>"
459 "uses markup <b>like this</> for styling and<br/>" 459 "uses markup <b>like this</> for styling and<br/>"
460 "formatting <em>like this</>, as well as<br/>" 460 "formatting <em>like this</>, as well as<br/>"
@@ -538,14 +538,14 @@ static void
538my_ent_bt_clr(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 538my_ent_bt_clr(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
539{ 539{
540 Evas_Object *en = data; 540 Evas_Object *en = data;
541 elm_entry_entry_set(en, ""); 541 elm_object_text_set(en, "");
542} 542}
543 543
544static void 544static void
545my_ent_bt_pri(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 545my_ent_bt_pri(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
546{ 546{
547 Evas_Object *en = data; 547 Evas_Object *en = data;
548 const char *s = elm_entry_entry_get(en); 548 const char *s = elm_object_text_get(en);
549 printf("ENTRY:\n"); 549 printf("ENTRY:\n");
550 if (s) printf("%s\n", s); 550 if (s) printf("%s\n", s);
551 printf("ENTRY PLAIN UTF8:\n"); 551 printf("ENTRY PLAIN UTF8:\n");
@@ -739,7 +739,7 @@ test_entry3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
739 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0); 739 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0);
740 evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5); 740 evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5);
741 elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF); 741 elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
742 elm_entry_entry_set(en, "This is a single line"); 742 elm_object_text_set(en, "This is a single line");
743 elm_entry_single_line_set(en, 1); 743 elm_entry_single_line_set(en, 1);
744 elm_box_pack_end(bx, en); 744 elm_box_pack_end(bx, en);
745 evas_object_show(en); 745 evas_object_show(en);
@@ -1001,7 +1001,7 @@ test_entry3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
1001 elm_entry_scrollable_set(en, EINA_TRUE); 1001 elm_entry_scrollable_set(en, EINA_TRUE);
1002 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 1002 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
1003 evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL); 1003 evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL);
1004 elm_entry_entry_set(en, 1004 elm_object_text_set(en,
1005 "This is an entry widget in this window that<br/>" 1005 "This is an entry widget in this window that<br/>"
1006 "uses markup <b>like this</> for styling and<br/>" 1006 "uses markup <b>like this</> for styling and<br/>"
1007 "formatting <em>like this</>, as well as<br/>" 1007 "formatting <em>like this</>, as well as<br/>"
@@ -1303,14 +1303,14 @@ test_entry4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
1303 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0); 1303 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0);
1304 evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5); 1304 evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5);
1305 elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF); 1305 elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
1306 elm_entry_entry_set(en, "This is a single line"); 1306 elm_object_text_set(en, "This is a single line");
1307 elm_entry_single_line_set(en, 1); 1307 elm_entry_single_line_set(en, 1);
1308 elm_object_part_content_set(ly, "element1", en); 1308 elm_object_part_content_set(ly, "element1", en);
1309 evas_object_show(en); 1309 evas_object_show(en);
1310 1310
1311 en = elm_entry_add(win); 1311 en = elm_entry_add(win);
1312 elm_entry_line_wrap_set(en, ELM_WRAP_NONE); 1312 elm_entry_line_wrap_set(en, ELM_WRAP_NONE);
1313 elm_entry_entry_set(en, 1313 elm_object_text_set(en,
1314 "This is an entry widget<br/>" 1314 "This is an entry widget<br/>"
1315 "that uses markup<br/>" 1315 "that uses markup<br/>"
1316 "<b>like this</> and has<br/>" 1316 "<b>like this</> and has<br/>"
@@ -1325,7 +1325,7 @@ test_entry4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
1325 elm_entry_scrollable_set(en, EINA_TRUE); 1325 elm_entry_scrollable_set(en, EINA_TRUE);
1326 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 1326 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
1327 evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL); 1327 evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL);
1328 elm_entry_entry_set(en, 1328 elm_object_text_set(en,
1329 "This is an entry widget in this window that<br/>" 1329 "This is an entry widget in this window that<br/>"
1330 "uses markup <b>like this</> for styling and<br/>" 1330 "uses markup <b>like this</> for styling and<br/>"
1331 "formatting <em>like this</>, as well as<br/>" 1331 "formatting <em>like this</>, as well as<br/>"
@@ -1369,7 +1369,7 @@ test_entry5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
1369 elm_entry_line_wrap_set(en, ELM_WRAP_CHAR); 1369 elm_entry_line_wrap_set(en, ELM_WRAP_CHAR);
1370 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 1370 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
1371 evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL); 1371 evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL);
1372 elm_entry_entry_set(en, 1372 elm_object_text_set(en,
1373 "This is an entry widget in this window that " 1373 "This is an entry widget in this window that "
1374 "uses markup like this for styling and " 1374 "uses markup like this for styling and "
1375 "formatting like this, as well as " 1375 "formatting like this, as well as "
@@ -1645,7 +1645,7 @@ static void
1645_scrolled_entry_clear(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) 1645_scrolled_entry_clear(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
1646{ 1646{
1647 Evas_Object *en = data; 1647 Evas_Object *en = data;
1648 elm_entry_entry_set(en, ""); 1648 elm_object_text_set(en, "");
1649} 1649}
1650 1650
1651void 1651void
diff --git a/src/bin/test_fileselector_button.c b/src/bin/test_fileselector_button.c
index 90775655c..24f881bb4 100644
--- a/src/bin/test_fileselector_button.c
+++ b/src/bin/test_fileselector_button.c
@@ -13,7 +13,7 @@ _file_chosen(void *data,
13 const char *file = event_info; 13 const char *file = event_info;
14 if (file) 14 if (file)
15 { 15 {
16 elm_entry_entry_set(entry, file); 16 elm_object_text_set(entry, file);
17 printf("File chosen: %s\n", file); 17 printf("File chosen: %s\n", file);
18 } 18 }
19 else 19 else
diff --git a/src/bin/test_fileselector_entry.c b/src/bin/test_fileselector_entry.c
index ff21a5da9..d340668f3 100644
--- a/src/bin/test_fileselector_entry.c
+++ b/src/bin/test_fileselector_entry.c
@@ -11,7 +11,7 @@ _file_chosen(void *data,
11{ 11{
12 Evas_Object *entry = data; 12 Evas_Object *entry = data;
13 char *file = event_info; 13 char *file = event_info;
14 elm_entry_entry_set(entry, file); 14 elm_object_text_set(entry, file);
15 printf("File chosen: %s\n", file); 15 printf("File chosen: %s\n", file);
16} 16}
17 17
diff --git a/src/bin/test_flip.c b/src/bin/test_flip.c
index 980a32761..bbf130b6c 100644
--- a/src/bin/test_flip.c
+++ b/src/bin/test_flip.c
@@ -301,7 +301,7 @@ test_flip2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
301 " ... end." 301 " ... end."
302 , elm_app_data_dir_get() 302 , elm_app_data_dir_get()
303 ); 303 );
304 elm_entry_entry_set(en, buf); 304 elm_object_text_set(en, buf);
305 evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL); 305 evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL);
306 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 306 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
307 307
diff --git a/src/bin/test_focus.c b/src/bin/test_focus.c
index ad4ca967c..14da12d1b 100644
--- a/src/bin/test_focus.c
+++ b/src/bin/test_focus.c
@@ -115,7 +115,7 @@ test_focus(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
115 elm_entry_scrollable_set(en, EINA_TRUE); 115 elm_entry_scrollable_set(en, EINA_TRUE);
116 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0); 116 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0);
117 evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5); 117 evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5);
118 elm_entry_entry_set(en, "This is a single line"); 118 elm_object_text_set(en, "This is a single line");
119 elm_entry_single_line_set(en, 1); 119 elm_entry_single_line_set(en, 1);
120 elm_box_pack_end(bx, en); 120 elm_box_pack_end(bx, en);
121 my_show(en); 121 my_show(en);
diff --git a/src/bin/test_focus2.c b/src/bin/test_focus2.c
index 401067dc2..5d9d6b562 100644
--- a/src/bin/test_focus2.c
+++ b/src/bin/test_focus2.c
@@ -81,7 +81,7 @@ test_focus2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
81 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0); 81 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0);
82 evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5); 82 evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5);
83 elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF); 83 elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
84 elm_entry_entry_set(en, "Scrolled Entry that should get focus"); 84 elm_object_text_set(en, "Scrolled Entry that should get focus");
85 elm_entry_single_line_set(en, 1); 85 elm_entry_single_line_set(en, 1);
86 evas_object_show(en); 86 evas_object_show(en);
87 elm_box_pack_end(bx, en); 87 elm_box_pack_end(bx, en);
@@ -109,7 +109,7 @@ test_focus2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
109 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0); 109 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0);
110 evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5); 110 evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5);
111 elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF); 111 elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
112 elm_entry_entry_set(en, "Scrolled Entry that should get focus"); 112 elm_object_text_set(en, "Scrolled Entry that should get focus");
113 elm_entry_single_line_set(en, 1); 113 elm_entry_single_line_set(en, 1);
114 elm_object_part_content_set(ly, "element2", en); 114 elm_object_part_content_set(ly, "element2", en);
115 115
diff --git a/src/bin/test_focus3.c b/src/bin/test_focus3.c
index 831871867..fcce98483 100644
--- a/src/bin/test_focus3.c
+++ b/src/bin/test_focus3.c
@@ -28,7 +28,7 @@ _add(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
28 28
29 en = elm_entry_add(elm_object_top_widget_get(bx)); 29 en = elm_entry_add(elm_object_top_widget_get(bx));
30 elm_entry_scrollable_set(en, EINA_TRUE); 30 elm_entry_scrollable_set(en, EINA_TRUE);
31 elm_entry_entry_set(en, "An entry"); 31 elm_object_text_set(en, "An entry");
32 evas_object_smart_callback_add(en, "focused", _foc, NULL); 32 evas_object_smart_callback_add(en, "focused", _foc, NULL);
33 evas_object_smart_callback_add(en, "unfocused", _unfoc, NULL); 33 evas_object_smart_callback_add(en, "unfocused", _unfoc, NULL);
34 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0); 34 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0);
@@ -73,7 +73,7 @@ test_focus3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
73 73
74 en = elm_entry_add(win); 74 en = elm_entry_add(win);
75 elm_entry_scrollable_set(en, EINA_TRUE); 75 elm_entry_scrollable_set(en, EINA_TRUE);
76 elm_entry_entry_set(en, "An entry"); 76 elm_object_text_set(en, "An entry");
77 evas_object_smart_callback_add(en, "focused", _foc, NULL); 77 evas_object_smart_callback_add(en, "focused", _foc, NULL);
78 evas_object_smart_callback_add(en, "unfocused", _unfoc, NULL); 78 evas_object_smart_callback_add(en, "unfocused", _unfoc, NULL);
79 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0); 79 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0);
diff --git a/src/bin/test_genlist.c b/src/bin/test_genlist.c
index fe50117c0..2a3cd7458 100644
--- a/src/bin/test_genlist.c
+++ b/src/bin/test_genlist.c
@@ -1252,7 +1252,7 @@ test_genlist7_swipe(void *data, Evas_Object *obj __UNUSED__, void *event_info)
1252 entry = elm_entry_add(info->win); 1252 entry = elm_entry_add(info->win);
1253 elm_entry_scrollable_set(entry, EINA_TRUE); 1253 elm_entry_scrollable_set(entry, EINA_TRUE);
1254 elm_entry_editable_set(entry, EINA_FALSE); 1254 elm_entry_editable_set(entry, EINA_FALSE);
1255 elm_entry_entry_set(entry, item_data); 1255 elm_object_text_set(entry, item_data);
1256 evas_object_size_hint_weight_set(entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 1256 evas_object_size_hint_weight_set(entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
1257 evas_object_size_hint_align_set(entry, EVAS_HINT_FILL, EVAS_HINT_FILL); 1257 evas_object_size_hint_align_set(entry, EVAS_HINT_FILL, EVAS_HINT_FILL);
1258 evas_object_show(entry); 1258 evas_object_show(entry);
diff --git a/src/bin/test_gesture_layer.c b/src/bin/test_gesture_layer.c
index f72b41525..9bcff0429 100644
--- a/src/bin/test_gesture_layer.c
+++ b/src/bin/test_gesture_layer.c
@@ -385,7 +385,7 @@ test_gesture_layer(void *data __UNUSED__, Evas_Object *obj __UNUSED__,
385 photo_array[ind++] = photo_object_add(win, NULL, buf, 40, 300, 365, 400, 45); 385 photo_array[ind++] = photo_object_add(win, NULL, buf, 40, 300, 365, 400, 45);
386 386
387 Evas_Object *en = elm_entry_add(win); 387 Evas_Object *en = elm_entry_add(win);
388 elm_entry_entry_set(en, "You can use whatever object you want, " 388 elm_object_text_set(en, "You can use whatever object you want, "
389 "even entries like this."); 389 "even entries like this.");
390 elm_entry_line_wrap_set(en, ELM_WRAP_MIXED); 390 elm_entry_line_wrap_set(en, ELM_WRAP_MIXED);
391 391
diff --git a/src/bin/test_grid.c b/src/bin/test_grid.c
index c1f838bb7..07dde6039 100644
--- a/src/bin/test_grid.c
+++ b/src/bin/test_grid.c
@@ -34,14 +34,14 @@ test_grid(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info _
34 34
35 en = elm_entry_add(win); 35 en = elm_entry_add(win);
36 elm_entry_scrollable_set(en, EINA_TRUE); 36 elm_entry_scrollable_set(en, EINA_TRUE);
37 elm_entry_entry_set(en, "Entry text"); 37 elm_object_text_set(en, "Entry text");
38 elm_entry_single_line_set(en, 1); 38 elm_entry_single_line_set(en, 1);
39 elm_grid_pack(gd, en, 50, 10, 40, 10); 39 elm_grid_pack(gd, en, 50, 10, 40, 10);
40 evas_object_show(en); 40 evas_object_show(en);
41 41
42 en = elm_entry_add(win); 42 en = elm_entry_add(win);
43 elm_entry_scrollable_set(en, EINA_TRUE); 43 elm_entry_scrollable_set(en, EINA_TRUE);
44 elm_entry_entry_set(en, "Entry text 2"); 44 elm_object_text_set(en, "Entry text 2");
45 elm_entry_single_line_set(en, 1); 45 elm_entry_single_line_set(en, 1);
46 elm_grid_pack(gd, en, 60, 20, 30, 10); 46 elm_grid_pack(gd, en, 60, 20, 30, 10);
47 evas_object_show(en); 47 evas_object_show(en);
diff --git a/src/bin/test_index.c b/src/bin/test_index.c
index 9c428f827..1b5bbee91 100644
--- a/src/bin/test_index.c
+++ b/src/bin/test_index.c
@@ -143,7 +143,7 @@ test_index2_it_add(void *data, Evas_Object *obj __UNUSED__, void *event_info __U
143 const char *label; 143 const char *label;
144 char letter[2]; 144 char letter[2];
145 145
146 label = elm_entry_entry_get(gui->entry); 146 label = elm_object_text_get(gui->entry);
147 snprintf(letter, sizeof(letter), "%c", label[0]); 147 snprintf(letter, sizeof(letter), "%c", label[0]);
148 it = elm_list_item_sorted_insert(gui->lst, label, NULL, NULL, NULL, NULL, 148 it = elm_list_item_sorted_insert(gui->lst, label, NULL, NULL, NULL, NULL,
149 test_index2_cmp); 149 test_index2_cmp);
@@ -224,7 +224,7 @@ test_index2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
224 224
225 gui->entry = elm_entry_add(win); 225 gui->entry = elm_entry_add(win);
226 elm_entry_scrollable_set(gui->entry, EINA_TRUE); 226 elm_entry_scrollable_set(gui->entry, EINA_TRUE);
227 elm_entry_entry_set(gui->entry, "Label"); 227 elm_object_text_set(gui->entry, "Label");
228 elm_entry_single_line_set(gui->entry, EINA_TRUE); 228 elm_entry_single_line_set(gui->entry, EINA_TRUE);
229 evas_object_size_hint_weight_set(gui->entry, EVAS_HINT_EXPAND, 0); 229 evas_object_size_hint_weight_set(gui->entry, EVAS_HINT_EXPAND, 0);
230 evas_object_size_hint_fill_set(gui->entry, EVAS_HINT_FILL, EVAS_HINT_FILL); 230 evas_object_size_hint_fill_set(gui->entry, EVAS_HINT_FILL, EVAS_HINT_FILL);
diff --git a/src/bin/test_list.c b/src/bin/test_list.c
index dca0565df..2399df3ac 100644
--- a/src/bin/test_list.c
+++ b/src/bin/test_list.c
@@ -613,7 +613,7 @@ test_list4_swipe(void *data,
613 entry = elm_entry_add(info->win); 613 entry = elm_entry_add(info->win);
614 elm_entry_scrollable_set(entry, EINA_TRUE); 614 elm_entry_scrollable_set(entry, EINA_TRUE);
615 elm_entry_editable_set(entry, EINA_FALSE); 615 elm_entry_editable_set(entry, EINA_FALSE);
616 elm_entry_entry_set(entry, item_data); 616 elm_object_text_set(entry, item_data);
617 evas_object_size_hint_weight_set(entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 617 evas_object_size_hint_weight_set(entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
618 evas_object_size_hint_align_set(entry, EVAS_HINT_FILL, EVAS_HINT_FILL); 618 evas_object_size_hint_align_set(entry, EVAS_HINT_FILL, EVAS_HINT_FILL);
619 evas_object_show(entry); 619 evas_object_show(entry);
diff --git a/src/bin/test_tooltip.c b/src/bin/test_tooltip.c
index 38565aacf..be1d2f41d 100644
--- a/src/bin/test_tooltip.c
+++ b/src/bin/test_tooltip.c
@@ -479,7 +479,7 @@ test_tooltip(void *data __UNUSED__,
479 evas_object_size_hint_align_set(se, EVAS_HINT_FILL, 0.5); 479 evas_object_size_hint_align_set(se, EVAS_HINT_FILL, 0.5);
480 elm_entry_scrollbar_policy_set(se, ELM_SCROLLER_POLICY_OFF, 480 elm_entry_scrollbar_policy_set(se, ELM_SCROLLER_POLICY_OFF,
481 ELM_SCROLLER_POLICY_OFF); 481 ELM_SCROLLER_POLICY_OFF);
482 elm_entry_entry_set(se, "Hello, some scrolled entry here!"); 482 elm_object_text_set(se, "Hello, some scrolled entry here!");
483 elm_object_tooltip_text_set(se, "Type something here!"); 483 elm_object_tooltip_text_set(se, "Type something here!");
484 elm_entry_single_line_set(se, 1); 484 elm_entry_single_line_set(se, 1);
485 elm_box_pack_end(bx, se); 485 elm_box_pack_end(bx, se);
diff --git a/src/bin/test_weather.c b/src/bin/test_weather.c
index 9d86b7c2a..873a1a753 100644
--- a/src/bin/test_weather.c
+++ b/src/bin/test_weather.c
@@ -36,7 +36,7 @@ static void _apply_cb(void *data __UNUSED__, Evas_Object *o __UNUSED__, void *ev
36 36
37 if (module[current]) 37 if (module[current])
38 eweather_plugin_set(eweather, module[current]); 38 eweather_plugin_set(eweather, module[current]);
39 eweather_code_set(eweather, elm_entry_entry_get(en)); 39 eweather_code_set(eweather, elm_object_text_get(en));
40 printf("CURRENT %d %p %p\n", current, module[current], eweather); 40 printf("CURRENT %d %p %p\n", current, module[current], eweather);
41} 41}
42 42
@@ -147,7 +147,7 @@ test_weather(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf
147 en = elm_entry_add(win); 147 en = elm_entry_add(win);
148 elm_entry_line_wrap_set(en, ELM_WRAP_NONE); 148 elm_entry_line_wrap_set(en, ELM_WRAP_NONE);
149 elm_entry_single_line_set(en, EINA_TRUE); 149 elm_entry_single_line_set(en, EINA_TRUE);
150 elm_entry_entry_set(en, "Paris"); 150 elm_object_text_set(en, "Paris");
151 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 151 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
152 evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL); 152 evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL);
153 elm_box_pack_end(bx0, en); 153 elm_box_pack_end(bx0, en);
diff --git a/src/bin/test_web.c b/src/bin/test_web.c
index 613402f5a..85294987a 100644
--- a/src/bin/test_web.c
+++ b/src/bin/test_web.c
@@ -66,7 +66,7 @@ _uri_changed_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info)
66{ 66{
67 Web_Test *wt = data; 67 Web_Test *wt = data;
68 68
69 elm_entry_entry_set(wt->url_entry, event_info); 69 elm_object_text_set(wt->url_entry, event_info);
70 70
71 elm_object_disabled_set(wt->btn_back, !elm_web_back_possible(wt->web)); 71 elm_object_disabled_set(wt->btn_back, !elm_web_back_possible(wt->web));
72 elm_object_disabled_set(wt->btn_fwd, !elm_web_forward_possible(wt->web)); 72 elm_object_disabled_set(wt->btn_fwd, !elm_web_forward_possible(wt->web));
diff --git a/src/bin/test_win_inline.c b/src/bin/test_win_inline.c
index 0a3b5cb8e..8de02667a 100644
--- a/src/bin/test_win_inline.c
+++ b/src/bin/test_win_inline.c
@@ -30,7 +30,7 @@ fill(Evas_Object *win, Eina_Bool do_bg)
30 elm_entry_scrollable_set(en, EINA_TRUE); 30 elm_entry_scrollable_set(en, EINA_TRUE);
31 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0); 31 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0);
32 evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5); 32 evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5);
33 elm_entry_entry_set(en, "This is a single line"); 33 elm_object_text_set(en, "This is a single line");
34 elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF); 34 elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
35 elm_entry_single_line_set(en, 1); 35 elm_entry_single_line_set(en, 1);
36 evas_object_show(en); 36 evas_object_show(en);
@@ -40,7 +40,7 @@ fill(Evas_Object *win, Eina_Bool do_bg)
40 elm_entry_scrollable_set(en, EINA_TRUE); 40 elm_entry_scrollable_set(en, EINA_TRUE);
41 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0); 41 evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0);
42 evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5); 42 evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5);
43 elm_entry_entry_set(en, "Entry 2"); 43 elm_object_text_set(en, "Entry 2");
44 elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF); 44 elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
45 elm_entry_single_line_set(en, 1); 45 elm_entry_single_line_set(en, 1);
46 evas_object_show(en); 46 evas_object_show(en);
diff --git a/src/edje_externals/elm_entry.c b/src/edje_externals/elm_entry.c
index 7998f8170..46056969b 100644
--- a/src/edje_externals/elm_entry.c
+++ b/src/edje_externals/elm_entry.c
@@ -58,7 +58,7 @@ external_entry_state_set(void *data __UNUSED__, Evas_Object *obj, const void *fr
58 if (p->icon) 58 if (p->icon)
59 elm_entry_icon_set(obj, p->icon); 59 elm_entry_icon_set(obj, p->icon);
60 if (p->entry) 60 if (p->entry)
61 elm_entry_entry_set(obj, p->entry); 61 elm_object_text_set(obj, p->entry);
62 if (p->scrollable_exists) 62 if (p->scrollable_exists)
63 elm_entry_scrollable_set(obj, p->scrollable); 63 elm_entry_scrollable_set(obj, p->scrollable);
64 if (p->single_line_exists) 64 if (p->single_line_exists)
@@ -108,7 +108,7 @@ external_entry_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_Ext
108 { 108 {
109 if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) 109 if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
110 { 110 {
111 elm_entry_entry_set(obj, param->s); 111 elm_object_text_set(obj, param->s);
112 return EINA_TRUE; 112 return EINA_TRUE;
113 } 113 }
114 } 114 }
@@ -204,7 +204,7 @@ external_entry_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_Ext
204 { 204 {
205 if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) 205 if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
206 { 206 {
207 param->s = elm_entry_entry_get(obj); 207 param->s = elm_object_text_get(obj);
208 return EINA_TRUE; 208 return EINA_TRUE;
209 } 209 }
210 } 210 }
diff --git a/src/examples/conformant_example_01.c b/src/examples/conformant_example_01.c
index e6528840a..0ec34fbd0 100644
--- a/src/examples/conformant_example_01.c
+++ b/src/examples/conformant_example_01.c
@@ -44,7 +44,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__)
44 44
45 en = elm_entry_add(win); 45 en = elm_entry_add(win);
46 elm_entry_scrollable_set(en, EINA_TRUE); 46 elm_entry_scrollable_set(en, EINA_TRUE);
47 elm_entry_entry_set(en, 47 elm_object_text_set(en,
48 "This is a multi-line entry at the bottom<br>" 48 "This is a multi-line entry at the bottom<br>"
49 "This can contain more than 1 line of text and be " 49 "This can contain more than 1 line of text and be "
50 "scrolled around to allow for entering of lots of " 50 "scrolled around to allow for entering of lots of "
diff --git a/src/examples/conformant_example_02.c b/src/examples/conformant_example_02.c
index 80d401ad3..0c05b0500 100644
--- a/src/examples/conformant_example_02.c
+++ b/src/examples/conformant_example_02.c
@@ -50,7 +50,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__)
50 50
51 en = elm_entry_add(win); 51 en = elm_entry_add(win);
52 elm_entry_scrollable_set(en, EINA_TRUE); 52 elm_entry_scrollable_set(en, EINA_TRUE);
53 elm_entry_entry_set(en, 53 elm_object_text_set(en,
54 "This is a multi-line entry at the bottom<br>" 54 "This is a multi-line entry at the bottom<br>"
55 "This can contain more than 1 line of text and be " 55 "This can contain more than 1 line of text and be "
56 "scrolled around to allow for entering of lots of " 56 "scrolled around to allow for entering of lots of "
diff --git a/src/examples/fileselector_button_example.c b/src/examples/fileselector_button_example.c
index f9be84a0b..a76cede44 100644
--- a/src/examples/fileselector_button_example.c
+++ b/src/examples/fileselector_button_example.c
@@ -33,7 +33,7 @@ _file_chosen(void *data,
33 const char *file = event_info; 33 const char *file = event_info;
34 if (file) 34 if (file)
35 { 35 {
36 elm_entry_entry_set(entry, file); 36 elm_object_text_set(entry, file);
37 printf("File chosen: %s\n", file); 37 printf("File chosen: %s\n", file);
38 } 38 }
39 else 39 else
diff --git a/src/lib/elc_anchorblock.c b/src/lib/elc_anchorblock.c
index cfeab470b..d37e939fe 100644
--- a/src/lib/elc_anchorblock.c
+++ b/src/lib/elc_anchorblock.c
@@ -188,7 +188,7 @@ _elm_anchorblock_text_set(Evas_Object *obj, const char *item, const char *text)
188 Widget_Data *wd = elm_widget_data_get(obj); 188 Widget_Data *wd = elm_widget_data_get(obj);
189 if (item && strcmp(item, "default")) return; 189 if (item && strcmp(item, "default")) return;
190 if (!wd) return; 190 if (!wd) return;
191 elm_entry_entry_set(wd->entry, text); 191 elm_object_text_set(wd->entry, text);
192 if (wd->hover) evas_object_del(wd->hover); 192 if (wd->hover) evas_object_del(wd->hover);
193 if (wd->pop) evas_object_del(wd->pop); 193 if (wd->pop) evas_object_del(wd->pop);
194 wd->hover = NULL; 194 wd->hover = NULL;
@@ -203,7 +203,7 @@ _elm_anchorblock_text_get(const Evas_Object *obj, const char *item)
203 Widget_Data *wd = elm_widget_data_get(obj); 203 Widget_Data *wd = elm_widget_data_get(obj);
204 if (item && strcmp(item, "default")) return NULL; 204 if (item && strcmp(item, "default")) return NULL;
205 if (!wd) return NULL; 205 if (!wd) return NULL;
206 return elm_entry_entry_get(wd->entry); 206 return elm_object_text_get(wd->entry);
207} 207}
208 208
209EAPI Evas_Object * 209EAPI Evas_Object *
@@ -236,7 +236,7 @@ elm_anchorblock_add(Evas_Object *parent)
236 evas_object_event_callback_add(wd->entry, EVAS_CALLBACK_CHANGED_SIZE_HINTS, 236 evas_object_event_callback_add(wd->entry, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
237 _changed_size_hints, obj); 237 _changed_size_hints, obj);
238 238
239 elm_entry_entry_set(wd->entry, ""); 239 elm_object_text_set(wd->entry, "");
240 240
241 evas_object_smart_callback_add(wd->entry, "anchor,clicked", 241 evas_object_smart_callback_add(wd->entry, "anchor,clicked",
242 _anchor_clicked, obj); 242 _anchor_clicked, obj);
diff --git a/src/lib/elc_anchorview.c b/src/lib/elc_anchorview.c
index 16994c76d..1245d9559 100644
--- a/src/lib/elc_anchorview.c
+++ b/src/lib/elc_anchorview.c
@@ -182,7 +182,7 @@ _elm_anchorview_text_set(Evas_Object *obj, const char *item, const char *text)
182 Widget_Data *wd = elm_widget_data_get(obj); 182 Widget_Data *wd = elm_widget_data_get(obj);
183 if (item && strcmp(item, "default")) return; 183 if (item && strcmp(item, "default")) return;
184 if (!wd) return; 184 if (!wd) return;
185 elm_entry_entry_set(wd->entry, text); 185 elm_object_text_set(wd->entry, text);
186 if (wd->hover) evas_object_del(wd->hover); 186 if (wd->hover) evas_object_del(wd->hover);
187 if (wd->pop) evas_object_del(wd->pop); 187 if (wd->pop) evas_object_del(wd->pop);
188 wd->hover = NULL; 188 wd->hover = NULL;
@@ -197,7 +197,7 @@ _elm_anchorview_text_get(const Evas_Object *obj, const char *item)
197 Widget_Data *wd = elm_widget_data_get(obj); 197 Widget_Data *wd = elm_widget_data_get(obj);
198 if (item && strcmp(item, "default")) return NULL; 198 if (item && strcmp(item, "default")) return NULL;
199 if (!wd) return NULL; 199 if (!wd) return NULL;
200 return elm_entry_entry_get(wd->entry); 200 return elm_object_text_get(wd->entry);
201} 201}
202 202
203EAPI Evas_Object * 203EAPI Evas_Object *
@@ -233,7 +233,7 @@ elm_anchorview_add(Evas_Object *parent)
233 evas_object_event_callback_add(wd->entry, EVAS_CALLBACK_CHANGED_SIZE_HINTS, 233 evas_object_event_callback_add(wd->entry, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
234 _changed_size_hints, obj); 234 _changed_size_hints, obj);
235 235
236 elm_entry_entry_set(wd->entry, ""); 236 elm_object_text_set(wd->entry, "");
237 237
238 evas_object_smart_callback_add(wd->entry, "anchor,clicked", 238 evas_object_smart_callback_add(wd->entry, "anchor,clicked",
239 _anchor_clicked, obj); 239 _anchor_clicked, obj);
diff --git a/src/lib/elc_fileselector.c b/src/lib/elc_fileselector.c
index 0380f7a3d..7c7269930 100644
--- a/src/lib/elc_fileselector.c
+++ b/src/lib/elc_fileselector.c
@@ -376,7 +376,7 @@ _sel_do(void *data)
376 if (wd->expand && wd->mode == ELM_FILESELECTOR_LIST) 376 if (wd->expand && wd->mode == ELM_FILESELECTOR_LIST)
377 { 377 {
378 _do_anchors(sd->fs, path); 378 _do_anchors(sd->fs, path);
379 elm_entry_entry_set(wd->filename_entry, ""); 379 elm_object_text_set(wd->filename_entry, "");
380 } 380 }
381 else 381 else
382 { 382 {
@@ -398,7 +398,7 @@ _sel_do(void *data)
398 _populate(sd->fs, p, NULL); 398 _populate(sd->fs, p, NULL);
399 eina_stringshare_del(p); 399 eina_stringshare_del(p);
400 } 400 }
401 elm_entry_entry_set(wd->filename_entry, 401 elm_object_text_set(wd->filename_entry,
402 ecore_file_file_get(path)); 402 ecore_file_file_get(path));
403 } 403 }
404 404
@@ -544,7 +544,7 @@ _do_anchors(Evas_Object *obj,
544 free(tok[0]); 544 free(tok[0]);
545 free(tok); 545 free(tok);
546 546
547 elm_entry_entry_set(wd->path_entry, buf); 547 elm_object_text_set(wd->path_entry, buf);
548} 548}
549 549
550#ifdef HAVE_EIO 550#ifdef HAVE_EIO
@@ -636,7 +636,7 @@ _signal_first(Widget_Request *wr)
636 _do_anchors(wr->obj, wr->path); 636 _do_anchors(wr->obj, wr->path);
637 } 637 }
638 638
639 if (wr->wd->filename_entry) elm_entry_entry_set(wr->wd->filename_entry, ""); 639 if (wr->wd->filename_entry) elm_object_text_set(wr->wd->filename_entry, "");
640 640
641 wr->first = EINA_FALSE; 641 wr->first = EINA_FALSE;
642} 642}
@@ -733,7 +733,7 @@ _populate(Evas_Object *obj,
733 _do_anchors(obj, path); 733 _do_anchors(obj, path);
734 } 734 }
735 735
736 if (wd->filename_entry) elm_entry_entry_set(wd->filename_entry, ""); 736 if (wd->filename_entry) elm_object_text_set(wd->filename_entry, "");
737 EINA_ITERATOR_FOREACH(it, file) 737 EINA_ITERATOR_FOREACH(it, file)
738 { 738 {
739 const char *filename; 739 const char *filename;
@@ -1141,7 +1141,7 @@ elm_fileselector_selected_get(const Evas_Object *obj)
1141 char *dir; 1141 char *dir;
1142 1142
1143 dir = wd->only_folder ? ecore_file_dir_get(wd->path) : strdup(wd->path); 1143 dir = wd->only_folder ? ecore_file_dir_get(wd->path) : strdup(wd->path);
1144 name = elm_entry_entry_get(wd->filename_entry); 1144 name = elm_object_text_get(wd->filename_entry);
1145 snprintf(buf, sizeof(buf), "%s/%s", 1145 snprintf(buf, sizeof(buf), "%s/%s",
1146 dir, name); 1146 dir, name);
1147 if (wd->only_folder && !ecore_file_is_dir(buf)) 1147 if (wd->only_folder && !ecore_file_is_dir(buf))
@@ -1186,7 +1186,7 @@ elm_fileselector_selected_set(Evas_Object *obj,
1186 _populate(obj, ecore_file_dir_get(path), NULL); 1186 _populate(obj, ecore_file_dir_get(path), NULL);
1187 if (wd->filename_entry) 1187 if (wd->filename_entry)
1188 { 1188 {
1189 elm_entry_entry_set(wd->filename_entry, 1189 elm_object_text_set(wd->filename_entry,
1190 ecore_file_file_get(path)); 1190 ecore_file_file_get(path));
1191 eina_stringshare_replace(&wd->selection, path); 1191 eina_stringshare_replace(&wd->selection, path);
1192 } 1192 }
diff --git a/src/lib/elc_fileselector_entry.c b/src/lib/elc_fileselector_entry.c
index bad2cafd5..96769d0fb 100644
--- a/src/lib/elc_fileselector_entry.c
+++ b/src/lib/elc_fileselector_entry.c
@@ -71,7 +71,7 @@ _FILE_CHOSEN_fwd(void *data, Evas_Object *obj __UNUSED__, void *event_info)
71{ 71{
72 Widget_Data *wd = elm_widget_data_get(data); 72 Widget_Data *wd = elm_widget_data_get(data);
73 const char *file = event_info; 73 const char *file = event_info;
74 elm_entry_entry_set(wd->entry, file); 74 elm_object_text_set(wd->entry, file);
75 evas_object_smart_callback_call(data, SIG_FILE_CHOSEN, event_info); 75 evas_object_smart_callback_call(data, SIG_FILE_CHOSEN, event_info);
76} 76}
77 77
@@ -79,7 +79,7 @@ static void
79_ACTIVATED_fwd(void *data, Evas_Object *obj __UNUSED__, void *event_info) 79_ACTIVATED_fwd(void *data, Evas_Object *obj __UNUSED__, void *event_info)
80{ 80{
81 Widget_Data *wd = elm_widget_data_get(data); 81 Widget_Data *wd = elm_widget_data_get(data);
82 const char *file = elm_entry_entry_get(wd->entry); 82 const char *file = elm_object_text_get(wd->entry);
83 elm_fileselector_button_path_set(wd->button, file); 83 elm_fileselector_button_path_set(wd->button, file);
84 evas_object_smart_callback_call(data, SIG_ACTIVATED, event_info); 84 evas_object_smart_callback_call(data, SIG_ACTIVATED, event_info);
85} 85}
@@ -385,7 +385,7 @@ elm_fileselector_entry_path_set(Evas_Object *obj, const char *path)
385 Widget_Data *wd = elm_widget_data_get(obj); 385 Widget_Data *wd = elm_widget_data_get(obj);
386 if (!wd) return; 386 if (!wd) return;
387 elm_fileselector_button_path_set(wd->button, path); 387 elm_fileselector_button_path_set(wd->button, path);
388 elm_entry_entry_set(wd->entry, path); 388 elm_object_text_set(wd->entry, path);
389} 389}
390 390
391EAPI const char * 391EAPI const char *
@@ -394,7 +394,7 @@ elm_fileselector_entry_path_get(const Evas_Object *obj)
394 ELM_CHECK_WIDTYPE(obj, widtype) NULL; 394 ELM_CHECK_WIDTYPE(obj, widtype) NULL;
395 Widget_Data *wd = elm_widget_data_get(obj); 395 Widget_Data *wd = elm_widget_data_get(obj);
396 if (!wd) return NULL; 396 if (!wd) return NULL;
397 return elm_entry_entry_get(wd->entry); 397 return elm_object_text_get(wd->entry);
398} 398}
399 399
400EAPI void 400EAPI void
diff --git a/src/lib/elc_multibuttonentry.c b/src/lib/elc_multibuttonentry.c
index cb7a01ce1..411d1d481 100644
--- a/src/lib/elc_multibuttonentry.c
+++ b/src/lib/elc_multibuttonentry.c
@@ -777,7 +777,7 @@ _add_button_item(Evas_Object *obj, const char *str, Multibuttonentry_Pos pos, co
777 str_utf8 = elm_entry_markup_to_utf8(str); 777 str_utf8 = elm_entry_markup_to_utf8(str);
778 778
779 //entry is cleared when text is made to button 779 //entry is cleared when text is made to button
780 elm_entry_entry_set(wd->entry, ""); 780 elm_object_text_set(wd->entry, "");
781 781
782 _elm_theme_object_set(obj, btn, "multibuttonentry", "btn", elm_widget_style_get(obj)); 782 _elm_theme_object_set(obj, btn, "multibuttonentry", "btn", elm_widget_style_get(obj));
783 edje_object_part_text_set(btn, "elm.btn.text", str_utf8); 783 edje_object_part_text_set(btn, "elm.btn.text", str_utf8);
@@ -984,7 +984,7 @@ _entry_key_up_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, vo
984 984
985 if (!wd || !wd->base || !wd->box) return; 985 if (!wd || !wd->base || !wd->box) return;
986 986
987 str = elm_entry_entry_get(wd->entry); 987 str = elm_object_text_get(wd->entry);
988 988
989 if ((strcmp(str, "") != 0) && (strcmp(ev->keyname, "KP_Enter") == 0 || strcmp(ev->keyname, "Return") == 0 )) 989 if ((strcmp(str, "") != 0) && (strcmp(ev->keyname, "KP_Enter") == 0 || strcmp(ev->keyname, "Return") == 0 ))
990 { 990 {
@@ -1027,7 +1027,7 @@ _entry_focus_out_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __
1027 1027
1028 if (!wd) return; 1028 if (!wd) return;
1029 1029
1030 str = elm_entry_entry_get(wd->entry); 1030 str = elm_object_text_get(wd->entry);
1031 if (strlen(str)) 1031 if (strlen(str))
1032 _add_button(data, str); 1032 _add_button(data, str);
1033} 1033}
@@ -1040,7 +1040,7 @@ _entry_changed_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UN
1040 1040
1041 if (!wd) return; 1041 if (!wd) return;
1042 1042
1043 str = elm_entry_entry_get(wd->entry); 1043 str = elm_object_text_get(wd->entry);
1044 wd->n_str = strlen(str); 1044 wd->n_str = strlen(str);
1045} 1045}
1046 1046
@@ -1089,7 +1089,7 @@ _view_init(Evas_Object *obj)
1089 wd->entry = elm_entry_add (obj); 1089 wd->entry = elm_entry_add (obj);
1090 if (!wd->entry) return; 1090 if (!wd->entry) return;
1091 elm_entry_single_line_set(wd->entry, EINA_TRUE); 1091 elm_entry_single_line_set(wd->entry, EINA_TRUE);
1092 elm_entry_entry_set(wd->entry, ""); 1092 elm_object_text_set(wd->entry, "");
1093 elm_entry_cursor_end_set(wd->entry); 1093 elm_entry_cursor_end_set(wd->entry);
1094 evas_object_size_hint_min_set(wd->entry, MIN_W_ENTRY, 0); 1094 evas_object_size_hint_min_set(wd->entry, MIN_W_ENTRY, 0);
1095 evas_object_size_hint_weight_set(wd->entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 1095 evas_object_size_hint_weight_set(wd->entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
diff --git a/src/lib/elc_scrolled_entry.c b/src/lib/elc_scrolled_entry.c
index c1de28e43..f47e0aab5 100644
--- a/src/lib/elc_scrolled_entry.c
+++ b/src/lib/elc_scrolled_entry.c
@@ -46,13 +46,13 @@ elm_scrolled_entry_password_get(const Evas_Object *obj)
46{return elm_entry_password_get(obj);} 46{return elm_entry_password_get(obj);}
47EINA_DEPRECATED EAPI void 47EINA_DEPRECATED EAPI void
48elm_scrolled_entry_entry_set(Evas_Object *obj, const char *entry) 48elm_scrolled_entry_entry_set(Evas_Object *obj, const char *entry)
49{elm_entry_entry_set(obj, entry);} 49{elm_object_text_set(obj, entry);}
50EINA_DEPRECATED EAPI void 50EINA_DEPRECATED EAPI void
51elm_scrolled_entry_entry_append(Evas_Object *obj, const char *entry) 51elm_scrolled_entry_entry_append(Evas_Object *obj, const char *entry)
52{elm_entry_entry_append(obj, entry);} 52{elm_entry_entry_append(obj, entry);}
53EINA_DEPRECATED EAPI const char * 53EINA_DEPRECATED EAPI const char *
54elm_scrolled_entry_entry_get(const Evas_Object *obj) 54elm_scrolled_entry_entry_get(const Evas_Object *obj)
55{return elm_entry_entry_get(obj);} 55{return elm_object_text_get(obj);}
56EINA_DEPRECATED EAPI Eina_Bool 56EINA_DEPRECATED EAPI Eina_Bool
57elm_scrolled_entry_is_empty(const Evas_Object *obj) 57elm_scrolled_entry_is_empty(const Evas_Object *obj)
58{return elm_entry_is_empty(obj);} 58{return elm_entry_is_empty(obj);}
diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index 94c89218d..9dd3ce5f3 100644
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -273,7 +273,7 @@ _load(Evas_Object *obj)
273 if (!wd) return; 273 if (!wd) return;
274 if (!wd->file) 274 if (!wd->file)
275 { 275 {
276 elm_entry_entry_set(obj, ""); 276 elm_object_text_set(obj, "");
277 return; 277 return;
278 } 278 }
279 switch (wd->format) 279 switch (wd->format)
@@ -290,11 +290,11 @@ _load(Evas_Object *obj)
290 } 290 }
291 if (text) 291 if (text)
292 { 292 {
293 elm_entry_entry_set(obj, text); 293 elm_object_text_set(obj, text);
294 free(text); 294 free(text);
295 } 295 }
296 else 296 else
297 elm_entry_entry_set(obj, ""); 297 elm_object_text_set(obj, "");
298} 298}
299 299
300static void 300static void
@@ -338,10 +338,10 @@ _save(Evas_Object *obj)
338 switch (wd->format) 338 switch (wd->format)
339 { 339 {
340 case ELM_TEXT_FORMAT_PLAIN_UTF8: 340 case ELM_TEXT_FORMAT_PLAIN_UTF8:
341 _save_plain_utf8(wd->file, elm_entry_entry_get(obj)); 341 _save_plain_utf8(wd->file, elm_object_text_get(obj));
342 break; 342 break;
343 case ELM_TEXT_FORMAT_MARKUP_UTF8: 343 case ELM_TEXT_FORMAT_MARKUP_UTF8:
344 _save_markup_utf8(wd->file, elm_entry_entry_get(obj)); 344 _save_markup_utf8(wd->file, elm_object_text_get(obj));
345 break; 345 break;
346 default: 346 default:
347 break; 347 break;
@@ -519,11 +519,11 @@ _theme_hook(Evas_Object *obj)
519 _elm_widget_mirrored_reload(obj); 519 _elm_widget_mirrored_reload(obj);
520 _mirrored_set(obj, elm_widget_mirrored_get(obj)); 520 _mirrored_set(obj, elm_widget_mirrored_get(obj));
521 521
522 t = eina_stringshare_add(elm_entry_entry_get(obj)); 522 t = eina_stringshare_add(elm_object_text_get(obj));
523 _elm_theme_object_set(obj, wd->ent, "entry", _getbase(obj), elm_widget_style_get(obj)); 523 _elm_theme_object_set(obj, wd->ent, "entry", _getbase(obj), elm_widget_style_get(obj));
524 if (_elm_config->desktop_entry) 524 if (_elm_config->desktop_entry)
525 edje_object_part_text_select_allow_set(wd->ent, "elm.text", EINA_TRUE); 525 edje_object_part_text_select_allow_set(wd->ent, "elm.text", EINA_TRUE);
526 elm_entry_entry_set(obj, t); 526 elm_object_text_set(obj, t);
527 eina_stringshare_del(t); 527 eina_stringshare_del(t);
528 if (elm_widget_disabled_get(obj)) 528 if (elm_widget_disabled_get(obj))
529 edje_object_signal_emit(wd->ent, "elm,state,disabled", "elm"); 529 edje_object_signal_emit(wd->ent, "elm,state,disabled", "elm");
@@ -2475,7 +2475,7 @@ elm_entry_password_get(const Evas_Object *obj)
2475 return wd->password; 2475 return wd->password;
2476} 2476}
2477 2477
2478EAPI void 2478EINA_DEPRECATED EAPI void
2479elm_entry_entry_set(Evas_Object *obj, const char *entry) 2479elm_entry_entry_set(Evas_Object *obj, const char *entry)
2480{ 2480{
2481 _elm_entry_text_set(obj, NULL, entry); 2481 _elm_entry_text_set(obj, NULL, entry);
@@ -2512,7 +2512,7 @@ elm_entry_entry_append(Evas_Object *obj, const char *entry)
2512 } 2512 }
2513} 2513}
2514 2514
2515EAPI const char * 2515EINA_DEPRECATED EAPI const char *
2516elm_entry_entry_get(const Evas_Object *obj) 2516elm_entry_entry_get(const Evas_Object *obj)
2517{ 2517{
2518 return _elm_entry_text_get(obj, NULL); 2518 return _elm_entry_text_get(obj, NULL);
@@ -3021,6 +3021,12 @@ elm_entry_utf8_to_markup(const char *s)
3021 return ss; 3021 return ss;
3022} 3022}
3023 3023
3024static const char *
3025_text_get(const Evas_Object *obj)
3026{
3027 return elm_object_text_get(obj);
3028}
3029
3024EAPI void 3030EAPI void
3025elm_entry_filter_limit_size(void *data, Evas_Object *entry, char **text) 3031elm_entry_filter_limit_size(void *data, Evas_Object *entry, char **text)
3026{ 3032{
@@ -3037,10 +3043,7 @@ elm_entry_filter_limit_size(void *data, Evas_Object *entry, char **text)
3037 /* hack. I don't want to copy the entire function to work with 3043 /* hack. I don't want to copy the entire function to work with
3038 * scrolled_entry */ 3044 * scrolled_entry */
3039 widget_type = elm_widget_type_get(entry); 3045 widget_type = elm_widget_type_get(entry);
3040 if (!strcmp(widget_type, "entry")) 3046 text_get = _text_get;
3041 text_get = elm_entry_entry_get;
3042 else /* huh? */
3043 return;
3044 3047
3045 current = elm_entry_markup_to_utf8(text_get(entry)); 3048 current = elm_entry_markup_to_utf8(text_get(entry));
3046 utfstr = elm_entry_markup_to_utf8(*text); 3049 utfstr = elm_entry_markup_to_utf8(*text);
diff --git a/src/lib/elm_spinner.c b/src/lib/elm_spinner.c
index 5db909ddf..fb6a31064 100644
--- a/src/lib/elm_spinner.c
+++ b/src/lib/elm_spinner.c
@@ -200,7 +200,7 @@ _entry_show(Widget_Data *wd)
200 } 200 }
201 } 201 }
202 snprintf(buf, sizeof(buf), fmt, wd->val); 202 snprintf(buf, sizeof(buf), fmt, wd->val);
203 elm_entry_entry_set(wd->ent, buf); 203 elm_object_text_set(wd->ent, buf);
204} 204}
205 205
206static void 206static void
@@ -364,7 +364,7 @@ _apply_entry_value(Evas_Object *obj)
364 364
365 if (!wd) return; 365 if (!wd) return;
366 _hide_entry(obj); 366 _hide_entry(obj);
367 str = elm_entry_entry_get(wd->ent); 367 str = elm_object_text_get(wd->ent);
368 if (!str) return; 368 if (!str) return;
369 val = strtod(str, &end); 369 val = strtod(str, &end);
370 if ((*end != '\0') && (!isspace(*end))) return; 370 if ((*end != '\0') && (!isspace(*end))) return;