Enlightenment CVS committal Author : lok Project : e17 Module : libs/etk
Dir : e17/libs/etk/src/lib Modified Files: etk_colorpicker.c etk_editable.c etk_textblock.c etk_widget.c Log Message: use evas_smart_class_new() =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_colorpicker.c,v retrieving revision 1.32 retrieving revision 1.33 diff -u -3 -r1.32 -r1.33 --- etk_colorpicker.c 25 Mar 2007 18:22:00 -0000 1.32 +++ etk_colorpicker.c 4 Aug 2007 14:46:21 -0000 1.33 @@ -887,14 +887,12 @@ if (!_etk_colorpicker_picker_smart) { - _etk_colorpicker_picker_smart = evas_smart_new("Picker_Object", + static const Evas_Smart_Class sc = + { + "Picker_Object", + EVAS_SMART_CLASS_VERSION, _etk_colorpicker_picker_smart_add, _etk_colorpicker_picker_smart_del, - NULL, - NULL, - NULL, - NULL, - NULL, _etk_colorpicker_picker_smart_move, _etk_colorpicker_picker_smart_resize, _etk_colorpicker_picker_smart_show, @@ -902,7 +900,9 @@ NULL, _etk_colorpicker_picker_smart_clip_set, _etk_colorpicker_picker_smart_clip_unset, - NULL); + NULL + }; + _etk_colorpicker_picker_smart = evas_smart_class_new(&sc); _etk_colorpicker_picker_smart_use = 0; } _etk_colorpicker_picker_smart_use++; =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_editable.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- etk_editable.c 19 Mar 2007 15:02:29 -0000 1.11 +++ etk_editable.c 4 Aug 2007 14:46:21 -0000 1.12 @@ -79,10 +79,12 @@ { if (!_etk_editable_smart) { - _etk_editable_smart = evas_smart_new("Editable_Object", + static const Evas_Smart_Class sc = + { + "Editable_Object", + EVAS_SMART_CLASS_VERSION, _etk_editable_smart_add, _etk_editable_smart_del, - NULL, NULL, NULL, NULL, NULL, _etk_editable_smart_move, _etk_editable_smart_resize, _etk_editable_smart_show, @@ -90,7 +92,9 @@ _etk_editable_color_set, _etk_editable_clip_set, _etk_editable_clip_unset, - NULL); + NULL + }; + _etk_editable_smart = evas_smart_class_new(&sc); _etk_editable_smart_use = 0; } =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_textblock.c,v retrieving revision 1.31 retrieving revision 1.32 diff -u -3 -r1.31 -r1.32 --- etk_textblock.c 8 Mar 2007 18:27:52 -0000 1.31 +++ etk_textblock.c 4 Aug 2007 14:46:21 -0000 1.32 @@ -1055,14 +1055,12 @@ if (!_etk_tb_object_smart) { - _etk_tb_object_smart = evas_smart_new("Textblock_Object", + static const Evas_Smart_Class sc = + { + "Textblock_Object", + EVAS_SMART_CLASS_VERSION, _etk_tb_object_smart_add, _etk_tb_object_smart_del, - NULL, - NULL, - NULL, - NULL, - NULL, _etk_tb_object_smart_move, _etk_tb_object_smart_resize, _etk_tb_object_smart_show, @@ -1070,7 +1068,9 @@ _etk_tb_object_smart_color_set, _etk_tb_object_smart_clip_set, _etk_tb_object_smart_clip_unset, - NULL); + NULL + }; + _etk_tb_object_smart = evas_smart_class_new(&sc); } _etk_tb_object_smart_use++; =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_widget.c,v retrieving revision 1.116 retrieving revision 1.117 diff -u -3 -r1.116 -r1.117 --- etk_widget.c 24 Jul 2007 21:40:16 -0000 1.116 +++ etk_widget.c 4 Aug 2007 14:46:22 -0000 1.117 @@ -3121,14 +3121,12 @@ if (!_etk_widget_smart_object_smart) { - _etk_widget_smart_object_smart = evas_smart_new("Widget_Object", - NULL, /* add */ - NULL, /* del */ - NULL, /* layer_set */ - NULL, /* raise */ - NULL, /* lower */ - NULL, /* stack_above */ - NULL, /* stack_below */ + static const Evas_Smart_Class sc = + { + "Widget_Object", + EVAS_SMART_CLASS_VERSION, + NULL, + NULL, _etk_widget_smart_object_move_cb, /* move */ _etk_widget_smart_object_resize_cb, /* resize */ _etk_widget_smart_object_show_cb, /* show */ @@ -3136,7 +3134,9 @@ _etk_widget_smart_object_color_set_cb, /* color_set */ _etk_widget_smart_object_clip_set_cb, /* clip_set */ _etk_widget_smart_object_clip_unset_cb, /* clip_unset */ - NULL); /* data*/ + NULL + }; + _etk_widget_smart_object_smart = evas_smart_class_new(&sc); } new_object = evas_object_smart_add(evas, _etk_widget_smart_object_smart); @@ -3441,14 +3441,12 @@ if (!_etk_widget_content_object_smart) { - _etk_widget_content_object_smart = evas_smart_new("Content_Object", - NULL, /* add */ - NULL, /* del */ - NULL, /* layer_set */ - NULL, /* raise */ - NULL, /* lower */ - NULL, /* stack_above */ - NULL, /* stack_below */ + static const Evas_Smart_Class sc = + { + "Content_Object", + EVAS_SMART_CLASS_VERSION, + NULL, + NULL, _etk_widget_content_object_move_cb, /* move */ _etk_widget_content_object_resize_cb, /* resize */ NULL, /* show */ @@ -3456,7 +3454,9 @@ NULL, /* color_set */ _etk_widget_content_object_clip_set_cb, /* clip_set */ _etk_widget_content_object_clip_unset_cb, /* clip_unset */ - NULL); /* data*/ + NULL + }; + _etk_widget_content_object_smart = evas_smart_class_new(&sc); } new_object = evas_object_smart_add(evas, _etk_widget_content_object_smart); ------------------------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs