From: Enlightenment S. <no-...@en...> - 2009-05-13 12:55:27
|
Log: actually give widgets type name strings and set parent by default Author: raster Date: 2009-05-13 05:21:52 -0700 (Wed, 13 May 2009) New Revision: 40618 Modified: trunk/TMP/st/elementary/data/themes/default.edc trunk/TMP/st/elementary/src/lib/elc_anchorblock.c trunk/TMP/st/elementary/src/lib/elc_anchorview.c trunk/TMP/st/elementary/src/lib/elc_hoversel.c trunk/TMP/st/elementary/src/lib/elc_notepad.c trunk/TMP/st/elementary/src/lib/elm_bg.c trunk/TMP/st/elementary/src/lib/elm_box.c trunk/TMP/st/elementary/src/lib/elm_bubble.c trunk/TMP/st/elementary/src/lib/elm_button.c trunk/TMP/st/elementary/src/lib/elm_carousel.c trunk/TMP/st/elementary/src/lib/elm_check.c trunk/TMP/st/elementary/src/lib/elm_clock.c trunk/TMP/st/elementary/src/lib/elm_entry.c trunk/TMP/st/elementary/src/lib/elm_frame.c trunk/TMP/st/elementary/src/lib/elm_genlist.c trunk/TMP/st/elementary/src/lib/elm_hover.c trunk/TMP/st/elementary/src/lib/elm_icon.c trunk/TMP/st/elementary/src/lib/elm_image.c trunk/TMP/st/elementary/src/lib/elm_label.c trunk/TMP/st/elementary/src/lib/elm_layout.c trunk/TMP/st/elementary/src/lib/elm_list.c trunk/TMP/st/elementary/src/lib/elm_pager.c trunk/TMP/st/elementary/src/lib/elm_photo.c trunk/TMP/st/elementary/src/lib/elm_priv.h trunk/TMP/st/elementary/src/lib/elm_radio.c trunk/TMP/st/elementary/src/lib/elm_scroller.c trunk/TMP/st/elementary/src/lib/elm_slider.c trunk/TMP/st/elementary/src/lib/elm_table.c trunk/TMP/st/elementary/src/lib/elm_toggle.c trunk/TMP/st/elementary/src/lib/elm_toolbar.c trunk/TMP/st/elementary/src/lib/elm_widget.c trunk/TMP/st/elementary/src/lib/elm_win.c Modified: trunk/TMP/st/elementary/data/themes/default.edc =================================================================== --- trunk/TMP/st/elementary/data/themes/default.edc 2009-05-13 12:20:14 UTC (rev 40617) +++ trunk/TMP/st/elementary/data/themes/default.edc 2009-05-13 12:21:52 UTC (rev 40618) @@ -3734,7 +3734,7 @@ styles { style { name: "entry_textblock_style"; - base: "font=Sans font_size=10 align=left color=#000 wrap=word"; + base: "font=Sans font_size=10 align=left color=#000 wrap=word"; tag: "br" "\n"; tag: "tab" "\t"; tag: "em" "+ font=Sans:style=Oblique"; Modified: trunk/TMP/st/elementary/src/lib/elc_anchorblock.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elc_anchorblock.c 2009-05-13 12:20:14 UTC (rev 40617) +++ trunk/TMP/st/elementary/src/lib/elc_anchorblock.c 2009-05-13 12:21:52 UTC (rev 40618) @@ -129,6 +129,8 @@ wd = ELM_NEW(Widget_Data); e = evas_object_evas_get(parent); obj = elm_widget_add(e); + elm_widget_type_set(obj, "anchorblock"); + elm_widget_sub_object_add(parent, obj); elm_widget_data_set(obj, wd); elm_widget_del_pre_hook_set(obj, _del_pre_hook); elm_widget_del_hook_set(obj, _del_hook); Modified: trunk/TMP/st/elementary/src/lib/elc_anchorview.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elc_anchorview.c 2009-05-13 12:20:14 UTC (rev 40617) +++ trunk/TMP/st/elementary/src/lib/elc_anchorview.c 2009-05-13 12:21:52 UTC (rev 40618) @@ -118,6 +118,8 @@ wd = ELM_NEW(Widget_Data); e = evas_object_evas_get(parent); obj = elm_widget_add(e); + elm_widget_type_set(obj, "anchorview"); + elm_widget_sub_object_add(parent, obj); elm_widget_data_set(obj, wd); elm_widget_del_pre_hook_set(obj, _del_pre_hook); elm_widget_del_hook_set(obj, _del_hook); Modified: trunk/TMP/st/elementary/src/lib/elc_hoversel.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elc_hoversel.c 2009-05-13 12:20:14 UTC (rev 40617) +++ trunk/TMP/st/elementary/src/lib/elc_hoversel.c 2009-05-13 12:21:52 UTC (rev 40618) @@ -159,6 +159,8 @@ wd = ELM_NEW(Widget_Data); e = evas_object_evas_get(parent); obj = elm_widget_add(e); + elm_widget_type_set(obj, "hoversel"); + elm_widget_sub_object_add(parent, obj); elm_widget_data_set(obj, wd); elm_widget_del_pre_hook_set(obj, _del_pre_hook); elm_widget_del_hook_set(obj, _del_hook); Modified: trunk/TMP/st/elementary/src/lib/elc_notepad.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elc_notepad.c 2009-05-13 12:20:14 UTC (rev 40617) +++ trunk/TMP/st/elementary/src/lib/elc_notepad.c 2009-05-13 12:21:52 UTC (rev 40618) @@ -215,6 +215,8 @@ wd = ELM_NEW(Widget_Data); e = evas_object_evas_get(parent); obj = elm_widget_add(e); + elm_widget_type_set(obj, "notepad"); + elm_widget_sub_object_add(parent, obj); elm_widget_on_focus_hook_set(obj, _on_focus_hook, NULL); elm_widget_data_set(obj, wd); elm_widget_del_hook_set(obj, _del_hook); Modified: trunk/TMP/st/elementary/src/lib/elm_bg.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_bg.c 2009-05-13 12:20:14 UTC (rev 40617) +++ trunk/TMP/st/elementary/src/lib/elm_bg.c 2009-05-13 12:21:52 UTC (rev 40618) @@ -61,6 +61,8 @@ wd = ELM_NEW(Widget_Data); e = evas_object_evas_get(parent); obj = elm_widget_add(e); + elm_widget_type_set(obj, "bg"); + elm_widget_sub_object_add(parent, obj); elm_widget_data_set(obj, wd); elm_widget_del_hook_set(obj, _del_hook); elm_widget_theme_hook_set(obj, _theme_hook); Modified: trunk/TMP/st/elementary/src/lib/elm_box.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_box.c 2009-05-13 12:20:14 UTC (rev 40617) +++ trunk/TMP/st/elementary/src/lib/elm_box.c 2009-05-13 12:21:52 UTC (rev 40618) @@ -65,6 +65,8 @@ wd = ELM_NEW(Widget_Data); e = evas_object_evas_get(parent); obj = elm_widget_add(e); + elm_widget_type_set(obj, "box"); + elm_widget_sub_object_add(parent, obj); elm_widget_data_set(obj, wd); elm_widget_del_hook_set(obj, _del_hook); Modified: trunk/TMP/st/elementary/src/lib/elm_bubble.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_bubble.c 2009-05-13 12:20:14 UTC (rev 40617) +++ trunk/TMP/st/elementary/src/lib/elm_bubble.c 2009-05-13 12:21:52 UTC (rev 40618) @@ -89,6 +89,8 @@ wd = ELM_NEW(Widget_Data); e = evas_object_evas_get(parent); obj = elm_widget_add(e); + elm_widget_type_set(obj, "bubble"); + elm_widget_sub_object_add(parent, obj); elm_widget_data_set(obj, wd); elm_widget_del_hook_set(obj, _del_hook); elm_widget_theme_hook_set(obj, _theme_hook); Modified: trunk/TMP/st/elementary/src/lib/elm_button.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_button.c 2009-05-13 12:20:14 UTC (rev 40617) +++ trunk/TMP/st/elementary/src/lib/elm_button.c 2009-05-13 12:21:52 UTC (rev 40618) @@ -107,6 +107,8 @@ wd = ELM_NEW(Widget_Data); e = evas_object_evas_get(parent); obj = elm_widget_add(e); + elm_widget_type_set(obj, "button"); + elm_widget_sub_object_add(parent, obj); elm_widget_data_set(obj, wd); elm_widget_del_hook_set(obj, _del_hook); elm_widget_theme_hook_set(obj, _theme_hook); Modified: trunk/TMP/st/elementary/src/lib/elm_carousel.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_carousel.c 2009-05-13 12:20:14 UTC (rev 40617) +++ trunk/TMP/st/elementary/src/lib/elm_carousel.c 2009-05-13 12:21:52 UTC (rev 40618) @@ -158,6 +158,8 @@ wd = ELM_NEW(Widget_Data); e = evas_object_evas_get(parent); obj = elm_widget_add(e); + elm_widget_type_set(obj, "carousel"); + elm_widget_sub_object_add(parent, obj); elm_widget_data_set(obj, wd); elm_widget_del_hook_set(obj, _del_hook); elm_widget_theme_hook_set(obj, _theme_hook); Modified: trunk/TMP/st/elementary/src/lib/elm_check.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_check.c 2009-05-13 12:20:14 UTC (rev 40617) +++ trunk/TMP/st/elementary/src/lib/elm_check.c 2009-05-13 12:21:52 UTC (rev 40618) @@ -134,6 +134,8 @@ wd = ELM_NEW(Widget_Data); e = evas_object_evas_get(parent); obj = elm_widget_add(e); + elm_widget_type_set(obj, "check"); + elm_widget_sub_object_add(parent, obj); elm_widget_data_set(obj, wd); elm_widget_del_hook_set(obj, _del_hook); elm_widget_theme_hook_set(obj, _theme_hook); Modified: trunk/TMP/st/elementary/src/lib/elm_clock.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_clock.c 2009-05-13 12:20:14 UTC (rev 40617) +++ trunk/TMP/st/elementary/src/lib/elm_clock.c 2009-05-13 12:21:52 UTC (rev 40618) @@ -368,6 +368,8 @@ wd = ELM_NEW(Widget_Data); e = evas_object_evas_get(parent); obj = elm_widget_add(e); + elm_widget_type_set(obj, "clock"); + elm_widget_sub_object_add(parent, obj); elm_widget_data_set(obj, wd); elm_widget_del_hook_set(obj, _del_hook); elm_widget_theme_hook_set(obj, _theme_hook); Modified: trunk/TMP/st/elementary/src/lib/elm_entry.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_entry.c 2009-05-13 12:20:14 UTC (rev 40617) +++ trunk/TMP/st/elementary/src/lib/elm_entry.c 2009-05-13 12:21:52 UTC (rev 40618) @@ -126,13 +126,13 @@ { evas_object_focus_set(wd->ent, 1); edje_object_signal_emit(wd->ent, "elm,action,focus", "elm"); - elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_ON); + if (top) elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_ON); } else { edje_object_signal_emit(wd->ent, "elm,action,unfocus", "elm"); evas_object_focus_set(wd->ent, 0); - elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_OFF); + if (top) elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_OFF); } } @@ -205,10 +205,13 @@ if (wd->sel_notify_handler) { #ifdef HAVE_ELEMENTARY_X - if (elm_win_xwindow_get(elm_widget_top_get(data))) + Evas_Object *top; + + top = elm_widget_top_get(data); + if ((top) && (elm_win_xwindow_get(top))) { ecore_x_selection_primary_request - (elm_win_xwindow_get(elm_widget_top_get(data)), + (elm_win_xwindow_get(top), ECORE_X_SELECTION_TARGET_UTF8_STRING); wd->selection_asked = 1; } @@ -265,11 +268,13 @@ _long_press(void *data) { Widget_Data *wd = elm_widget_data_get(data); + Evas_Object *top; if (wd->hoversel) evas_object_del(wd->hoversel); wd->hoversel = elm_hoversel_add(data); elm_widget_sub_object_add(data, wd->hoversel); elm_hoversel_label_set(wd->hoversel, "Text"); - elm_hoversel_hover_parent_set(wd->hoversel, elm_widget_top_get(data)); + top = elm_widget_top_get(data); + if (top) elm_hoversel_hover_parent_set(wd->hoversel, top); evas_object_smart_callback_add(wd->hoversel, "dismissed", _dismissed, data); if (!wd->selmode) { @@ -614,10 +619,12 @@ if (txt) { #ifdef HAVE_ELEMENTARY_X - if (elm_win_xwindow_get(elm_widget_top_get(data))) - ecore_x_selection_primary_set - (elm_win_xwindow_get(elm_widget_top_get(data)), - txt, strlen(txt)); + Evas_Object *top; + + top = elm_widget_top_get(data); + if ((top) && (elm_win_xwindow_get(top))) + ecore_x_selection_primary_set + (elm_win_xwindow_get(top), txt, strlen(txt)); #endif free(txt); } @@ -636,10 +643,12 @@ if (txt) { #ifdef HAVE_ELEMENTARY_X - if (elm_win_xwindow_get(elm_widget_top_get(data))) + Evas_Object *top; + + top = elm_widget_top_get(data); + if ((top) && (elm_win_xwindow_get(top))) ecore_x_selection_primary_set - (elm_win_xwindow_get(elm_widget_top_get(data)), - txt, strlen(txt)); + (elm_win_xwindow_get(top), txt, strlen(txt)); #endif free(txt); } @@ -658,7 +667,10 @@ if (wd->cut_sel) { #ifdef HAVE_ELEMENTARY_X - if (elm_win_xwindow_get(elm_widget_top_get(data))) + Evas_Object *top; + + top = elm_widget_top_get(data); + if ((top) && (elm_win_xwindow_get(top))) { char *t; @@ -666,8 +678,7 @@ if (t) { ecore_x_selection_primary_set - (elm_win_xwindow_get(elm_widget_top_get(data)), - t, strlen(t)); + (elm_win_xwindow_get(top), t, strlen(t)); free(t); } } @@ -678,7 +689,10 @@ else { #ifdef HAVE_ELEMENTARY_X - if (elm_win_xwindow_get(elm_widget_top_get(data))) + Evas_Object *top; + + top = elm_widget_top_get(data); + if ((top) && (elm_win_xwindow_get(top))) ecore_x_selection_primary_clear(); #endif } @@ -693,10 +707,13 @@ if (wd->sel_notify_handler) { #ifdef HAVE_ELEMENTARY_X - if (elm_win_xwindow_get(elm_widget_top_get(data))) + Evas_Object *top; + + top = elm_widget_top_get(data); + if ((top) && (elm_win_xwindow_get(top))) { ecore_x_selection_primary_request - (elm_win_xwindow_get(elm_widget_top_get(data)), + (elm_win_xwindow_get(top), ECORE_X_SELECTION_TARGET_UTF8_STRING); wd->selection_asked = 1; } @@ -880,13 +897,15 @@ EAPI Evas_Object * elm_entry_add(Evas_Object *parent) { - Evas_Object *obj; + Evas_Object *obj, *top; Evas *e; Widget_Data *wd; wd = ELM_NEW(Widget_Data); e = evas_object_evas_get(parent); obj = elm_widget_add(e); + elm_widget_type_set(obj, "entry"); + elm_widget_sub_object_add(parent, obj); elm_widget_on_focus_hook_set(obj, _on_focus_hook, NULL); elm_widget_data_set(obj, wd); elm_widget_del_hook_set(obj, _del_hook); @@ -923,7 +942,8 @@ _sizing_eval(obj); #ifdef HAVE_ELEMENTARY_X - if (elm_win_xwindow_get(elm_widget_top_get(parent)) != 0) + top = elm_widget_top_get(obj); + if ((top) && (elm_win_xwindow_get(top))) { wd->sel_notify_handler = ecore_event_handler_add(ECORE_X_EVENT_SELECTION_NOTIFY, Modified: trunk/TMP/st/elementary/src/lib/elm_frame.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_frame.c 2009-05-13 12:20:14 UTC (rev 40617) +++ trunk/TMP/st/elementary/src/lib/elm_frame.c 2009-05-13 12:21:52 UTC (rev 40618) @@ -76,6 +76,8 @@ wd = ELM_NEW(Widget_Data); e = evas_object_evas_get(parent); obj = elm_widget_add(e); + elm_widget_type_set(obj, "frame"); + elm_widget_sub_object_add(parent, obj); elm_widget_data_set(obj, wd); elm_widget_del_hook_set(obj, _del_hook); elm_widget_theme_hook_set(obj, _theme_hook); Modified: trunk/TMP/st/elementary/src/lib/elm_genlist.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_genlist.c 2009-05-13 12:20:14 UTC (rev 40617) +++ trunk/TMP/st/elementary/src/lib/elm_genlist.c 2009-05-13 12:21:52 UTC (rev 40618) @@ -792,6 +792,8 @@ wd = ELM_NEW(Widget_Data); e = evas_object_evas_get(parent); obj = elm_widget_add(e); + elm_widget_type_set(obj, "genlist"); + elm_widget_sub_object_add(parent, obj); elm_widget_data_set(obj, wd); elm_widget_del_hook_set(obj, _del_hook); elm_widget_theme_hook_set(obj, _theme_hook); Modified: trunk/TMP/st/elementary/src/lib/elm_hover.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_hover.c 2009-05-13 12:20:14 UTC (rev 40617) +++ trunk/TMP/st/elementary/src/lib/elm_hover.c 2009-05-13 12:21:52 UTC (rev 40618) @@ -258,6 +258,8 @@ wd = ELM_NEW(Widget_Data); e = evas_object_evas_get(parent); obj = elm_widget_add(e); + elm_widget_type_set(obj, "hover"); + elm_widget_sub_object_add(parent, obj); elm_widget_data_set(obj, wd); elm_widget_del_pre_hook_set(obj, _del_pre_hook); elm_widget_theme_hook_set(obj, _theme_hook); Modified: trunk/TMP/st/elementary/src/lib/elm_icon.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_icon.c 2009-05-13 12:20:14 UTC (rev 40617) +++ trunk/TMP/st/elementary/src/lib/elm_icon.c 2009-05-13 12:21:52 UTC (rev 40618) @@ -87,6 +87,8 @@ wd = ELM_NEW(Widget_Data); e = evas_object_evas_get(parent); obj = elm_widget_add(e); + elm_widget_type_set(obj, "icon"); + elm_widget_sub_object_add(parent, obj); elm_widget_data_set(obj, wd); elm_widget_del_hook_set(obj, _del_hook); elm_widget_theme_hook_set(obj, _theme_hook); Modified: trunk/TMP/st/elementary/src/lib/elm_image.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_image.c 2009-05-13 12:20:14 UTC (rev 40617) +++ trunk/TMP/st/elementary/src/lib/elm_image.c 2009-05-13 12:21:52 UTC (rev 40618) @@ -87,6 +87,8 @@ wd = ELM_NEW(Widget_Data); e = evas_object_evas_get(parent); obj = elm_widget_add(e); + elm_widget_type_set(obj, "image"); + elm_widget_sub_object_add(parent, obj); elm_widget_data_set(obj, wd); elm_widget_del_hook_set(obj, _del_hook); elm_widget_theme_hook_set(obj, _theme_hook); Modified: trunk/TMP/st/elementary/src/lib/elm_label.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_label.c 2009-05-13 12:20:14 UTC (rev 40617) +++ trunk/TMP/st/elementary/src/lib/elm_label.c 2009-05-13 12:21:52 UTC (rev 40618) @@ -52,6 +52,8 @@ wd = ELM_NEW(Widget_Data); e = evas_object_evas_get(parent); obj = elm_widget_add(e); + elm_widget_type_set(obj, "label"); + elm_widget_sub_object_add(parent, obj); elm_widget_data_set(obj, wd); elm_widget_del_hook_set(obj, _del_hook); elm_widget_theme_hook_set(obj, _theme_hook); Modified: trunk/TMP/st/elementary/src/lib/elm_layout.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_layout.c 2009-05-13 12:20:14 UTC (rev 40617) +++ trunk/TMP/st/elementary/src/lib/elm_layout.c 2009-05-13 12:21:52 UTC (rev 40618) @@ -102,6 +102,8 @@ wd = ELM_NEW(Widget_Data); e = evas_object_evas_get(parent); obj = elm_widget_add(e); + elm_widget_type_set(obj, "layout"); + elm_widget_sub_object_add(parent, obj); elm_widget_data_set(obj, wd); elm_widget_del_hook_set(obj, _del_hook); elm_widget_theme_hook_set(obj, _theme_hook); Modified: trunk/TMP/st/elementary/src/lib/elm_list.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_list.c 2009-05-13 12:20:14 UTC (rev 40617) +++ trunk/TMP/st/elementary/src/lib/elm_list.c 2009-05-13 12:21:52 UTC (rev 40618) @@ -395,6 +395,8 @@ wd = ELM_NEW(Widget_Data); e = evas_object_evas_get(parent); obj = elm_widget_add(e); + elm_widget_type_set(obj, "list"); + elm_widget_sub_object_add(parent, obj); elm_widget_on_focus_hook_set(obj, _on_focus_hook, NULL); elm_widget_data_set(obj, wd); elm_widget_del_hook_set(obj, _del_hook); Modified: trunk/TMP/st/elementary/src/lib/elm_pager.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_pager.c 2009-05-13 12:20:14 UTC (rev 40617) +++ trunk/TMP/st/elementary/src/lib/elm_pager.c 2009-05-13 12:21:52 UTC (rev 40618) @@ -173,6 +173,8 @@ wd = ELM_NEW(Widget_Data); e = evas_object_evas_get(parent); obj = elm_widget_add(e); + elm_widget_type_set(obj, "pager"); + elm_widget_sub_object_add(parent, obj); elm_widget_data_set(obj, wd); elm_widget_del_hook_set(obj, _del_hook); elm_widget_theme_hook_set(obj, _theme_hook); Modified: trunk/TMP/st/elementary/src/lib/elm_photo.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_photo.c 2009-05-13 12:20:14 UTC (rev 40617) +++ trunk/TMP/st/elementary/src/lib/elm_photo.c 2009-05-13 12:21:52 UTC (rev 40618) @@ -65,6 +65,8 @@ wd = ELM_NEW(Widget_Data); e = evas_object_evas_get(parent); obj = elm_widget_add(e); + elm_widget_type_set(obj, "photo"); + elm_widget_sub_object_add(parent, obj); elm_widget_data_set(obj, wd); elm_widget_del_hook_set(obj, _del_hook); elm_widget_theme_hook_set(obj, _theme_hook); Modified: trunk/TMP/st/elementary/src/lib/elm_priv.h =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_priv.h 2009-05-13 12:20:14 UTC (rev 40617) +++ trunk/TMP/st/elementary/src/lib/elm_priv.h 2009-05-13 12:21:52 UTC (rev 40618) @@ -107,6 +107,8 @@ EAPI double elm_widget_scale_get(const Evas_Object *obj); EAPI void elm_widget_style_set(Evas_Object *obj, const char *style); EAPI const char *elm_widget_style_get(const Evas_Object *obj); +EAPI void elm_widget_type_set(Evas_Object *obj, const char *type); +EAPI const char *elm_widget_type_get(const Evas_Object *obj); extern char *_elm_appname; extern Elm_Config *_elm_config; Modified: trunk/TMP/st/elementary/src/lib/elm_radio.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_radio.c 2009-05-13 12:20:14 UTC (rev 40617) +++ trunk/TMP/st/elementary/src/lib/elm_radio.c 2009-05-13 12:21:52 UTC (rev 40618) @@ -151,6 +151,8 @@ wd = ELM_NEW(Widget_Data); e = evas_object_evas_get(parent); obj = elm_widget_add(e); + elm_widget_type_set(obj, "radio"); + elm_widget_sub_object_add(parent, obj); elm_widget_data_set(obj, wd); elm_widget_del_hook_set(obj, _del_hook); elm_widget_theme_hook_set(obj, _theme_hook); Modified: trunk/TMP/st/elementary/src/lib/elm_scroller.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_scroller.c 2009-05-13 12:20:14 UTC (rev 40617) +++ trunk/TMP/st/elementary/src/lib/elm_scroller.c 2009-05-13 12:21:52 UTC (rev 40618) @@ -178,6 +178,8 @@ wd = ELM_NEW(Widget_Data); e = evas_object_evas_get(parent); obj = elm_widget_add(e); + elm_widget_type_set(obj, "scroller"); + elm_widget_sub_object_add(parent, obj); elm_widget_data_set(obj, wd); elm_widget_del_hook_set(obj, _del_hook); elm_widget_theme_hook_set(obj, _theme_hook); Modified: trunk/TMP/st/elementary/src/lib/elm_slider.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_slider.c 2009-05-13 12:20:14 UTC (rev 40617) +++ trunk/TMP/st/elementary/src/lib/elm_slider.c 2009-05-13 12:21:52 UTC (rev 40618) @@ -218,6 +218,8 @@ wd = ELM_NEW(Widget_Data); e = evas_object_evas_get(parent); obj = elm_widget_add(e); + elm_widget_type_set(obj, "slider"); + elm_widget_sub_object_add(parent, obj); elm_widget_data_set(obj, wd); elm_widget_del_hook_set(obj, _del_hook); elm_widget_theme_hook_set(obj, _theme_hook); Modified: trunk/TMP/st/elementary/src/lib/elm_table.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_table.c 2009-05-13 12:20:14 UTC (rev 40617) +++ trunk/TMP/st/elementary/src/lib/elm_table.c 2009-05-13 12:21:52 UTC (rev 40618) @@ -65,6 +65,8 @@ wd = ELM_NEW(Widget_Data); e = evas_object_evas_get(parent); obj = elm_widget_add(e); + elm_widget_type_set(obj, "table"); + elm_widget_sub_object_add(parent, obj); elm_widget_data_set(obj, wd); elm_widget_del_hook_set(obj, _del_hook); Modified: trunk/TMP/st/elementary/src/lib/elm_toggle.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_toggle.c 2009-05-13 12:20:14 UTC (rev 40617) +++ trunk/TMP/st/elementary/src/lib/elm_toggle.c 2009-05-13 12:21:52 UTC (rev 40618) @@ -123,6 +123,8 @@ wd = ELM_NEW(Widget_Data); e = evas_object_evas_get(parent); obj = elm_widget_add(e); + elm_widget_type_set(obj, "toggle"); + elm_widget_sub_object_add(parent, obj); elm_widget_data_set(obj, wd); elm_widget_del_hook_set(obj, _del_hook); elm_widget_theme_hook_set(obj, _theme_hook); Modified: trunk/TMP/st/elementary/src/lib/elm_toolbar.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_toolbar.c 2009-05-13 12:20:14 UTC (rev 40617) +++ trunk/TMP/st/elementary/src/lib/elm_toolbar.c 2009-05-13 12:21:52 UTC (rev 40618) @@ -179,6 +179,8 @@ wd = ELM_NEW(Widget_Data); e = evas_object_evas_get(parent); obj = elm_widget_add(e); + elm_widget_type_set(obj, "toolbar"); + elm_widget_sub_object_add(parent, obj); elm_widget_data_set(obj, wd); elm_widget_del_hook_set(obj, _del_hook); elm_widget_theme_hook_set(obj, _theme_hook); Modified: trunk/TMP/st/elementary/src/lib/elm_widget.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_widget.c 2009-05-13 12:20:14 UTC (rev 40617) +++ trunk/TMP/st/elementary/src/lib/elm_widget.c 2009-05-13 12:21:52 UTC (rev 40618) @@ -16,6 +16,7 @@ struct _Smart_Data { Evas_Object *obj; + const char *type; Evas_Object *parent_obj; Evas_Coord x, y, w, h; Eina_List *subobjs; @@ -74,7 +75,6 @@ { sd->subobjs = eina_list_remove(sd->subobjs, obj); } - if (sd->style) eina_stringshare_del(sd->style); evas_object_smart_callback_call(sd->obj, "sub-object-del", obj); } @@ -788,6 +788,24 @@ return "default"; } +EAPI void +elm_widget_type_set(Evas_Object *obj, const char *type) +{ + const char *old; + API_ENTRY return; + old = sd->type; + sd->type = eina_stringshare_add(type); + if (old) eina_stringshare_del(old); +} + +EAPI const char * +elm_widget_type_get(const Evas_Object *obj) +{ + API_ENTRY return ""; + if (sd->type) return sd->type; + return ""; +} + /* local subsystem functions */ static void _smart_reconfigure(Smart_Data *sd) @@ -850,6 +868,8 @@ evas_object_del(sobj); } if (sd->del_func) sd->del_func(obj); + if (sd->style) eina_stringshare_del(sd->style); + if (sd->type) eina_stringshare_del(sd->type); free(sd); } Modified: trunk/TMP/st/elementary/src/lib/elm_win.c =================================================================== --- trunk/TMP/st/elementary/src/lib/elm_win.c 2009-05-13 12:20:14 UTC (rev 40617) +++ trunk/TMP/st/elementary/src/lib/elm_win.c 2009-05-13 12:21:52 UTC (rev 40618) @@ -336,6 +336,7 @@ win->evas = ecore_evas_get(win->ee); win->win_obj = elm_widget_add(win->evas); + elm_widget_type_set(win->win_obj, "win"); elm_widget_data_set(win->win_obj, win); evas_object_color_set(win->win_obj, 0, 0, 0, 0); evas_object_move(win->win_obj, 0, 0); @@ -676,6 +677,8 @@ if (!win) return NULL; wd = ELM_NEW(Widget_Data); obj2 = elm_widget_add(win->evas); + elm_widget_type_set(obj2, "inwin"); + elm_widget_sub_object_add(obj, obj2); evas_object_size_hint_weight_set(obj2, 1.0, 1.0); evas_object_size_hint_align_set(obj2, -1.0, -1.0); elm_win_resize_object_add(obj, obj2); |