Jiyoun, this is wrong. It should be like this: elm_button_icon_set() -> elm_object_content_set() or elm_object_part_content_set(btn, "icon", icon) Some are already fixed though.
Daniel Juyung Seo (SeoZ) On Tue, Mar 6, 2012 at 5:50 PM, Enlightenment SVN <[email protected]> wrote: > Log: > remove deprecated code related with elm_button_icon_set/get > > > Author: jypark > Date: 2012-03-06 00:50:25 -0800 (Tue, 06 Mar 2012) > New Revision: 68791 > Trac: http://trac.enlightenment.org/e/changeset/68791 > > Modified: > trunk/BINDINGS/cxx/elementaryxx/src/Button.cpp > trunk/BINDINGS/perl/Elementary/Elementary.xs > trunk/BINDINGS/perl/lib/EFL/Elementary.pm > trunk/BINDINGS/perl/t/elementary_test.t > trunk/PROTO/elm_indicator/src/bin/elm_ind_win.c > trunk/PROTO/elm_softkey/src/bin/main.c > trunk/PROTO/eupnp/examples/media_server_browser.c > trunk/PROTO/shellementary/src/bin/shelm_macros.c > trunk/elementary/src/lib/elm_button.c trunk/elmdentica/src/elmdentica.c > trunk/elmdentica/src/settings.c > trunk/enki/src/bin/evas_object/slideshow_object.c trunk/enki/src/bin/map.c > > Modified: trunk/BINDINGS/cxx/elementaryxx/src/Button.cpp > =================================================================== > --- trunk/BINDINGS/cxx/elementaryxx/src/Button.cpp 2012-03-06 08:20:35 > UTC (rev 68790) > +++ trunk/BINDINGS/cxx/elementaryxx/src/Button.cpp 2012-03-06 08:50:25 > UTC (rev 68791) > @@ -29,7 +29,7 @@ > > void Button::setIcon (const Evasxx::Object &icon) > { > - elm_button_icon_set (o, icon.obj ()); > + elm_object_part_content_set (o, icon.obj ()); > } > > } // end namespace Elmxx > > Modified: trunk/BINDINGS/perl/Elementary/Elementary.xs > =================================================================== > --- trunk/BINDINGS/perl/Elementary/Elementary.xs 2012-03-06 08:20:35 > UTC (rev 68790) > +++ trunk/BINDINGS/perl/Elementary/Elementary.xs 2012-03-06 08:50:25 > UTC (rev 68791) > @@ -412,13 +412,7 @@ > Evas_Object * > elm_button_add(Evas_Object *parent) > > -void > -elm_button_icon_set(Evas_Object *obj, Evas_Object *icon) > > -Evas_Object * > -elm_button_icon_get(Evas_Object *obj) > - > - > # scroller > # > ------------------------------------------------------------------------------ > > > Modified: trunk/BINDINGS/perl/lib/EFL/Elementary.pm > =================================================================== > --- trunk/BINDINGS/perl/lib/EFL/Elementary.pm 2012-03-06 08:20:35 UTC (rev > 68790) > +++ trunk/BINDINGS/perl/lib/EFL/Elementary.pm 2012-03-06 08:50:25 UTC (rev > 68791) > @@ -239,8 +239,6 @@ > > my @elm_button = qw( > elm_button_add > - elm_button_icon_set > - elm_button_icon_get > ); > > my @elm_scroller = qw( > @@ -985,8 +983,6 @@ > elm_bubble_add > elm_bubble_corner_set > elm_button_add > - elm_button_icon_get > - elm_button_icon_set > elm_check_add > elm_check_icon_get > elm_check_icon_set > > Modified: trunk/BINDINGS/perl/t/elementary_test.t > =================================================================== > --- trunk/BINDINGS/perl/t/elementary_test.t 2012-03-06 08:20:35 UTC (rev > 68790) > +++ trunk/BINDINGS/perl/t/elementary_test.t 2012-03-06 08:50:25 UTC (rev > 68791) > @@ -408,7 +408,7 @@ > evas_object_size_hint_aspect_set($ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); > $bt = elm_button_add($win); > elm_object_text_set($bt, "Icon sized to button"); > - elm_button_icon_set($bt, $ic); > + elm_object_part_content_set($bt, $ic); > elm_box_pack_end($bx, $bt); > evas_object_show($bt); > evas_object_show($ic); > @@ -418,7 +418,7 @@ > elm_icon_scale_set($ic, 0, 0); > $bt = elm_button_add($win); > elm_object_text_set($bt, "Icon no scale"); > - elm_button_icon_set($bt, $ic); > + elm_object_part_content_set($bt, $ic); > elm_box_pack_end($bx, $bt); > evas_object_show($bt); > evas_object_show($ic); > @@ -428,7 +428,7 @@ > evas_object_size_hint_aspect_set($ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); > $bt = elm_button_add($win); > elm_object_text_set($bt, "Disabled Button"); > - elm_button_icon_set($bt, $ic); > + elm_object_part_content_set($bt, $ic); > elm_object_disabled_set($bt, 1); > elm_box_pack_end($bx, $bt); > evas_object_show($bt); > @@ -438,7 +438,7 @@ > elm_icon_file_set($ic, $images{'logo_small'}, undef); > evas_object_size_hint_aspect_set($ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); > $bt = elm_button_add($win); > - elm_button_icon_set($bt, $ic); > + elm_object_part_content_set($bt, $ic); > elm_object_disabled_set($bt, 1); > elm_box_pack_end($bx, $bt); > evas_object_show($bt); > @@ -453,7 +453,7 @@ > elm_icon_file_set($ic, $images{'logo_small'}, undef); > elm_icon_scale_set($ic, 0, 0); > $bt = elm_button_add($win); > - elm_button_icon_set($bt, $ic); > + elm_object_part_content_set($bt, $ic); > elm_box_pack_end($bx, $bt); > evas_object_show($bt); > evas_object_show($ic); > @@ -469,7 +469,7 @@ > evas_object_size_hint_aspect_set($ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); > $bt = elm_button_add($win); > elm_object_style_set($bt, "anchor"); > - elm_button_icon_set($bt, $ic); > + elm_object_part_content_set($bt, $ic); > elm_box_pack_end($bx, $bt); > evas_object_show($bt); > evas_object_show($ic); > @@ -479,7 +479,7 @@ > evas_object_size_hint_aspect_set($ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); > $bt = elm_button_add($win); > elm_object_style_set($bt, "anchor"); > - elm_button_icon_set($bt, $ic); > + elm_object_part_content_set($bt, $ic); > elm_object_disabled_set($bt, 1); > elm_box_pack_end($bx, $bt); > evas_object_show($bt); > @@ -1236,7 +1236,7 @@ > $ic = elm_icon_add($win); > elm_icon_standard_set($ic, "arrow_left"); > elm_icon_scale_set($ic, 1, 0); > - elm_button_icon_set($bt, $ic); > + elm_object_part_content_set($bt, $ic); > evas_object_show($ic); > > evas_object_smart_callback_add($bt, "clicked", \&my_notepad_bt_1, \$np); > @@ -1249,7 +1249,7 @@ > $ic = elm_icon_add($win); > elm_icon_standard_set($ic, "close"); > elm_icon_scale_set($ic, 1, 0); > - elm_button_icon_set($bt, $ic); > + elm_object_part_content_set($bt, $ic); > evas_object_show($ic); > > evas_object_smart_callback_add($bt, "clicked", \&my_notepad_bt_2, \$np); > @@ -1262,7 +1262,7 @@ > $ic = elm_icon_add($win); > elm_icon_standard_set($ic, "arrow_right"); > elm_icon_scale_set($ic, 1, 0); > - elm_button_icon_set($bt, $ic); > + elm_object_part_content_set($bt, $ic); > evas_object_show($ic); > > evas_object_smart_callback_add($bt, "clicked", \&my_notepad_bt_3, \$np); > > Modified: trunk/PROTO/elm_indicator/src/bin/elm_ind_win.c > =================================================================== > --- trunk/PROTO/elm_indicator/src/bin/elm_ind_win.c 2012-03-06 08:20:35 > UTC (rev 68790) > +++ trunk/PROTO/elm_indicator/src/bin/elm_ind_win.c 2012-03-06 08:50:25 > UTC (rev 68791) > @@ -72,7 +72,7 @@ > elm_icon_file_set(icon, buff, NULL); > evas_object_size_hint_aspect_set(icon, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); > btn = elm_button_add(iwin->win); > - elm_button_icon_set(btn, icon); > + elm_object_part_content_set(btn, icon); > evas_object_smart_callback_add(btn, "clicked", _cb_btn_home_clicked, iwin); > evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, 0.0); > elm_box_pack_end(box, btn); > @@ -82,7 +82,7 @@ > /* create mode button */ > icon = elm_icon_add(iwin->win); > iwin->mode = elm_button_add(iwin->win); > - elm_button_icon_set(iwin->mode, icon); > + elm_object_part_content_set(iwin->mode, icon); > evas_object_smart_callback_add(iwin->mode, "clicked", > _cb_btn_mode_clicked, iwin); > evas_object_size_hint_align_set(iwin->mode, EVAS_HINT_FILL, 0.0); > @@ -101,7 +101,7 @@ > elm_icon_file_set(icon, buff, NULL); > evas_object_size_hint_aspect_set(icon, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); > btn = elm_button_add(iwin->win); > - elm_button_icon_set(btn, icon); > + elm_object_part_content_set(btn, icon); > evas_object_smart_callback_add(btn, "clicked", _cb_btn_kbd_clicked, NULL); > evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, 0.0); > elm_box_pack_end(box, btn); > @@ -345,7 +345,7 @@ > Evas_Object *icon; > char buff[PATH_MAX]; > > - if (!(icon = elm_button_icon_get(iwin->mode))) return; > + if (!(icon = elm_object_part_content_get(iwin->mode))) return; > zone = (Ecore_X_Window)evas_object_data_get(iwin->win, "zone"); > mode = ecore_x_e_illume_mode_get(zone); > if (mode <= ECORE_X_ILLUME_MODE_SINGLE) > @@ -356,7 +356,7 @@ > snprintf(buff, sizeof(buff), "%s/images/dual-left.png", > PACKAGE_DATA_DIR); > elm_icon_file_set(icon, buff, NULL); > evas_object_size_hint_aspect_set(icon, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); > - elm_button_icon_set(iwin->mode, icon); > + elm_object_part_content_set(iwin->mode, icon); > evas_object_show(icon); > } > > @@ -384,9 +384,9 @@ > } > } > > - icon = elm_button_icon_get(btn); > + icon = elm_object_part_content_get(btn); > if (!icon) return; > elm_icon_file_set(icon, buff, NULL); > evas_object_size_hint_aspect_set(icon, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); > - elm_button_icon_set(btn, icon); > + elm_object_part_content_set(btn, icon); > } > > Modified: trunk/PROTO/elm_softkey/src/bin/main.c > =================================================================== > --- trunk/PROTO/elm_softkey/src/bin/main.c 2012-03-06 08:20:35 UTC (rev > 68790) > +++ trunk/PROTO/elm_softkey/src/bin/main.c 2012-03-06 08:50:25 UTC (rev > 68791) > @@ -72,7 +72,7 @@ > 1, 1); > > btn = elm_button_add(win); > - elm_button_icon_set(btn, icon); > + elm_object_part_content_set(btn, icon); > evas_object_smart_callback_add(btn, "clicked", > _cb_btn_back_clicked, win); > evas_object_size_hint_align_set(btn, 1.0, 0.5); > @@ -89,7 +89,7 @@ > 1, 1); > > btn = elm_button_add(win); > - elm_button_icon_set(btn, icon); > + elm_object_part_content_set(btn, icon); > evas_object_smart_callback_add(btn, "clicked", > _cb_btn_close_clicked, win); > evas_object_size_hint_align_set(btn, 1.0, 0.5); > > Modified: trunk/PROTO/eupnp/examples/media_server_browser.c > =================================================================== > --- trunk/PROTO/eupnp/examples/media_server_browser.c 2012-03-06 08:20:35 > UTC (rev 68790) > +++ trunk/PROTO/eupnp/examples/media_server_browser.c 2012-03-06 08:50:25 > UTC (rev 68791) > @@ -469,7 +469,7 @@ > > bt = elm_button_add(win); > elm_object_text_set(bt, "Back"); > - elm_button_icon_set(bt, ic); > + elm_object_part_content_set(bt, ic); > evas_object_smart_callback_add(bt, "clicked", on_back_clicked, NULL); > > main_label = elm_label_add(win); > > Modified: trunk/PROTO/shellementary/src/bin/shelm_macros.c > =================================================================== > --- trunk/PROTO/shellementary/src/bin/shelm_macros.c 2012-03-06 08:20:35 > UTC (rev 68790) > +++ trunk/PROTO/shellementary/src/bin/shelm_macros.c 2012-03-06 08:50:25 > UTC (rev 68791) > @@ -66,7 +66,7 @@ > elm_icon_file_set(icon, button_icon, NULL); > evas_object_size_hint_aspect_set(icon, EVAS_ASPECT_CONTROL_VERTICAL, 1, > 1); > evas_object_show(icon); > - elm_button_icon_set(button, icon); > + elm_object_part_content_set(button, icon); > } > > elm_object_text_set(button, label); > > Modified: trunk/elementary/src/lib/elm_button.c > =================================================================== > --- trunk/elementary/src/lib/elm_button.c 2012-03-06 08:20:35 UTC (rev > 68790) > +++ trunk/elementary/src/lib/elm_button.c 2012-03-06 08:50:25 UTC (rev > 68791) > @@ -468,24 +468,6 @@ > } > > EAPI void > -elm_button_icon_set(Evas_Object *obj, Evas_Object *icon) > -{ > - _content_set_hook(obj, "icon", icon); > -} > - > -EAPI Evas_Object * > -elm_button_icon_get(const Evas_Object *obj) > -{ > - return _content_get_hook(obj, "icon"); > -} > - > -EAPI Evas_Object * > -elm_button_icon_unset(Evas_Object *obj) > -{ > - return _content_unset_hook(obj, "icon"); > -} > - > -EAPI void > elm_button_autorepeat_set(Evas_Object *obj, Eina_Bool on) > { > ELM_CHECK_WIDTYPE(obj, widtype); > > Modified: trunk/elmdentica/src/elmdentica.c > =================================================================== > --- trunk/elmdentica/src/elmdentica.c 2012-03-06 08:20:35 UTC (rev 68790) > +++ trunk/elmdentica/src/elmdentica.c 2012-03-06 08:50:25 UTC (rev 68791) > @@ -2141,7 +2141,7 @@ > evas_object_size_hint_weight_set(gui.post, 1, > 1); > evas_object_size_hint_align_set(gui.post, -1, > 0); > elm_object_text_set(gui.post, _("Send")); > - elm_button_icon_set(gui.post, icon); > + elm_object_part_content_set(gui.post, icon); > evas_object_smart_callback_add(gui.post, > "clicked", on_post, NULL); > elm_box_pack_end(box2, gui.post); > evas_object_show(gui.post); > @@ -2154,7 +2154,7 @@ > evas_object_size_hint_weight_set(bt, 1, 1); > evas_object_size_hint_align_set(bt, -1, 0); > elm_object_text_set(bt, _("DM")); > - elm_button_icon_set(bt, icon); > + elm_object_part_content_set(bt, icon); > evas_object_smart_callback_add(bt, "clicked", > on_post_dm, NULL); > elm_box_pack_end(box2, bt); > evas_object_show(bt); > @@ -2167,7 +2167,7 @@ > evas_object_size_hint_weight_set(bt, 1, 1); > evas_object_size_hint_align_set(bt, -1, 0); > elm_object_text_set(bt, _("Hide")); > - elm_button_icon_set(bt, icon); > + elm_object_part_content_set(bt, icon); > evas_object_smart_callback_add(bt, "clicked", > on_post_hide, NULL); > elm_box_pack_end(box2, bt); > evas_object_show(bt); > > Modified: trunk/elmdentica/src/settings.c > =================================================================== > --- trunk/elmdentica/src/settings.c 2012-03-06 08:20:35 UTC (rev 68790) > +++ trunk/elmdentica/src/settings.c 2012-03-06 08:50:25 UTC (rev 68791) > @@ -742,7 +742,7 @@ > evas_object_show(icon); > > button = elm_button_add(settings_win); > - elm_button_icon_set(button, icon); > + elm_object_part_content_set(button, icon); > elm_object_text_set(button, _("Add")); > evas_object_smart_callback_add(button, > "clicked", on_account_add, list); > evas_object_size_hint_weight_set(button, 1, 1); > @@ -755,7 +755,7 @@ > evas_object_show(icon); > > button = elm_button_add(settings_win); > - elm_button_icon_set(button, icon); > + elm_object_part_content_set(button, icon); > elm_object_text_set(button, _("Edit")); > evas_object_smart_callback_add(button, > "clicked", on_account_edit, list); > evas_object_size_hint_weight_set(button, 1, 1); > @@ -769,7 +769,7 @@ > evas_object_show(icon); > > button = elm_button_add(settings_win); > - elm_button_icon_set(button, icon); > + elm_object_part_content_set(button, icon); > elm_object_text_set(button, _("Delete")); > evas_object_smart_callback_add(button, > "clicked", on_account_delete, list); > evas_object_size_hint_weight_set(button, 1, 1); > @@ -1374,7 +1374,7 @@ > evas_object_show(icon); > > button = elm_button_add(settings_win); > - elm_button_icon_set(button, icon); > + elm_object_part_content_set(button, icon); > elm_object_text_set(button, _("Add")); > evas_object_smart_callback_add(button, > "clicked", on_gag_add, list); > evas_object_size_hint_weight_set(button, 1, 1); > @@ -1387,7 +1387,7 @@ > evas_object_show(icon); > > button = elm_button_add(settings_win); > - elm_button_icon_set(button, icon); > + elm_object_part_content_set(button, icon); > elm_object_text_set(button, _("Edit")); > evas_object_smart_callback_add(button, > "clicked", on_gag_edit, list); > evas_object_size_hint_weight_set(button, 1, 1); > @@ -1400,7 +1400,7 @@ > evas_object_show(icon); > > button = elm_button_add(settings_win); > - elm_button_icon_set(button, icon); > + elm_object_part_content_set(button, icon); > elm_object_text_set(button, _("Delete")); > evas_object_smart_callback_add(button, > "clicked", on_gag_delete, list); > evas_object_size_hint_weight_set(button, 1, 1); > > Modified: trunk/enki/src/bin/evas_object/slideshow_object.c > =================================================================== > --- trunk/enki/src/bin/evas_object/slideshow_object.c 2012-03-06 08:20:35 > UTC (rev 68790) > +++ trunk/enki/src/bin/evas_object/slideshow_object.c 2012-03-06 08:50:25 > UTC (rev 68791) > @@ -137,7 +137,7 @@ > > icon = elm_icon_add(obj); > elm_icon_standard_set(icon, "arrow_left"); > - elm_button_icon_set(bt, icon); > + elm_object_part_content_set(bt, icon); > > bt = elm_button_add(obj); > sd->bt_right = bt; > @@ -151,7 +151,7 @@ > > icon = elm_icon_add(obj); > elm_icon_standard_set(icon, "arrow_right"); > - elm_button_icon_set(bt, icon); > + elm_object_part_content_set(bt, icon); > > //manage the size > Evas_Coord minw, minh, maxw, maxh; > > Modified: trunk/enki/src/bin/map.c > =================================================================== > --- trunk/enki/src/bin/map.c 2012-03-06 08:20:35 UTC (rev 68790) > +++ trunk/enki/src/bin/map.c 2012-03-06 08:50:25 UTC (rev 68791) > @@ -343,7 +343,7 @@ > snprintf(buf, sizeof(buf), "icons/geocaching/%s", > enlil_geocaching_gp_type_get(gp)); > elm_icon_file_set(o, Theme, buf); > - elm_button_icon_set(bt, o); > + elm_object_part_content_set(bt, o); > evas_object_smart_callback_add(bt, "clicked", _bt_geocaching_cb, gp); > > snprintf(buf, sizeof(buf), "terrain,%s", > enlil_geocaching_gp_terrain_get(gp)); > > > ------------------------------------------------------------------------------ > Keep Your Developer Skills Current with LearnDevNow! > The most comprehensive online learning library for Microsoft developers > is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, > Metro Style Apps, more. Free future releases when you subscribe now! > http://p.sf.net/sfu/learndevnow-d2d > _______________________________________________ > enlightenment-svn mailing list > [email protected] > https://lists.sourceforge.net/lists/listinfo/enlightenment-svn ------------------------------------------------------------------------------ This SF email is sponsosred by: Try Windows Azure free for 90 days Click Here http://p.sf.net/sfu/sfd2d-msazure _______________________________________________ enlightenment-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
