From: Enlightenment C. <no...@cv...> - 2007-03-13 23:40:23
|
Enlightenment CVS committal Author : moom Project : e17 Module : libs/etk Dir : e17/libs/etk/src/lib Modified Files: etk_alignment.c etk_bin.c etk_box.c etk_button.c etk_cache.c etk_canvas.c etk_check_button.c etk_colorpicker.c etk_combobox.c etk_container.c etk_dialog.c etk_embed.c Log Message: Formatting.. =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_alignment.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- etk_alignment.c 22 Feb 2007 22:24:25 -0000 1.11 +++ etk_alignment.c 14 Mar 2007 05:40:21 -0000 1.12 @@ -39,16 +39,16 @@ if (!alignment_type) { alignment_type = etk_type_new("Etk_Alignment", ETK_BIN_TYPE, sizeof(Etk_Alignment), - ETK_CONSTRUCTOR(_etk_alignment_constructor), NULL); + ETK_CONSTRUCTOR(_etk_alignment_constructor), NULL); etk_type_property_add(alignment_type, "xalign", ETK_ALIGNMENT_XALIGN_PROPERTY, - ETK_PROPERTY_FLOAT, ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_float(0.5)); + ETK_PROPERTY_FLOAT, ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_float(0.5)); etk_type_property_add(alignment_type, "yalign", ETK_ALIGNMENT_YALIGN_PROPERTY, - ETK_PROPERTY_FLOAT, ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_float(0.5)); + ETK_PROPERTY_FLOAT, ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_float(0.5)); etk_type_property_add(alignment_type, "xscale", ETK_ALIGNMENT_XSCALE_PROPERTY, - ETK_PROPERTY_FLOAT, ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_float(1.0)); + ETK_PROPERTY_FLOAT, ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_float(1.0)); etk_type_property_add(alignment_type, "yscale", ETK_ALIGNMENT_YSCALE_PROPERTY, - ETK_PROPERTY_FLOAT, ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_float(1.0)); + ETK_PROPERTY_FLOAT, ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_float(1.0)); alignment_type->property_set = _etk_alignment_property_set; alignment_type->property_get = _etk_alignment_property_get; @@ -68,7 +68,7 @@ Etk_Widget *etk_alignment_new(float xalign, float yalign, float xscale, float yscale) { return etk_widget_new(ETK_ALIGNMENT_TYPE, "xalign", xalign, - "yalign", yalign, "xscale", xscale, "yscale", yscale, NULL); + "yalign", yalign, "xscale", xscale, "yscale", yscale, NULL); } /** =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_bin.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -3 -r1.19 -r1.20 --- etk_bin.c 22 Feb 2007 22:24:25 -0000 1.19 +++ etk_bin.c 14 Mar 2007 05:40:21 -0000 1.20 @@ -43,10 +43,10 @@ if (!bin_type) { bin_type = etk_type_new("Etk_Bin", ETK_CONTAINER_TYPE, sizeof(Etk_Bin), - ETK_CONSTRUCTOR(_etk_bin_constructor), NULL); + ETK_CONSTRUCTOR(_etk_bin_constructor), NULL); etk_type_property_add(bin_type, "child", ETK_BIN_CHILD_PROPERTY, - ETK_PROPERTY_POINTER, ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_pointer(NULL)); + ETK_PROPERTY_POINTER, ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_pointer(NULL)); bin_type->property_set = _etk_bin_property_set; bin_type->property_get = _etk_bin_property_get; =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_box.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -3 -r1.21 -r1.22 --- etk_box.c 10 Mar 2007 00:57:58 -0000 1.21 +++ etk_box.c 14 Mar 2007 05:40:21 -0000 1.22 @@ -55,12 +55,12 @@ if (!box_type) { box_type = etk_type_new("Etk_Box", ETK_CONTAINER_TYPE, sizeof(Etk_Box), - ETK_CONSTRUCTOR(_etk_box_constructor), ETK_DESTRUCTOR(_etk_box_destructor)); + ETK_CONSTRUCTOR(_etk_box_constructor), ETK_DESTRUCTOR(_etk_box_destructor)); etk_type_property_add(box_type, "spacing", ETK_BOX_SPACING_PROPERTY, - ETK_PROPERTY_INT, ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_int(0)); + ETK_PROPERTY_INT, ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_int(0)); etk_type_property_add(box_type, "homogeneous", ETK_BOX_HOMOGENEOUS_PROPERTY, - ETK_PROPERTY_BOOL, ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_bool(ETK_FALSE)); + ETK_PROPERTY_BOOL, ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_bool(ETK_FALSE)); box_type->property_set = _etk_box_property_set; box_type->property_get = _etk_box_property_get; @@ -81,7 +81,7 @@ if (!hbox_type) { hbox_type = etk_type_new("Etk_HBox", ETK_BOX_TYPE, sizeof(Etk_HBox), - ETK_CONSTRUCTOR(_etk_hbox_constructor), NULL); + ETK_CONSTRUCTOR(_etk_hbox_constructor), NULL); } return hbox_type; @@ -99,7 +99,7 @@ if (!vbox_type) { vbox_type = etk_type_new("Etk_VBox", ETK_BOX_TYPE, sizeof(Etk_VBox), - ETK_CONSTRUCTOR(_etk_vbox_constructor), NULL); + ETK_CONSTRUCTOR(_etk_vbox_constructor), NULL); } return vbox_type; @@ -680,7 +680,8 @@ child_geometry.w -= 2 * cell->padding; etk_container_child_space_fill(child, &child_geometry, - cell->fill_policy & ETK_BOX_FILL, !(cell->fill_policy & ETK_BOX_SHRINK_OPPOSITE), 0.5, 0.5); + cell->fill_policy & ETK_BOX_FILL, + !(cell->fill_policy & ETK_BOX_SHRINK_OPPOSITE), 0.5, 0.5); etk_widget_size_allocate(child, child_geometry); } @@ -744,7 +745,8 @@ child_geometry.w -= 2 * cell->padding; etk_container_child_space_fill(child, &child_geometry, - cell->fill_policy & ETK_BOX_FILL, !(cell->fill_policy & ETK_BOX_SHRINK_OPPOSITE), 0.5, 0.5); + cell->fill_policy & ETK_BOX_FILL, + !(cell->fill_policy & ETK_BOX_SHRINK_OPPOSITE), 0.5, 0.5); etk_widget_size_allocate(child, child_geometry); } @@ -902,7 +904,8 @@ child_geometry.h -= 2 * cell->padding; etk_container_child_space_fill(child, &child_geometry, - !(cell->fill_policy & ETK_BOX_SHRINK_OPPOSITE), cell->fill_policy & ETK_BOX_FILL, 0.5, 0.5); + !(cell->fill_policy & ETK_BOX_SHRINK_OPPOSITE), + cell->fill_policy & ETK_BOX_FILL, 0.5, 0.5); etk_widget_size_allocate(child, child_geometry); } @@ -966,7 +969,8 @@ child_geometry.h -= 2 * cell->padding; etk_container_child_space_fill(child, &child_geometry, - !(cell->fill_policy & ETK_BOX_SHRINK_OPPOSITE), cell->fill_policy & ETK_BOX_FILL, 0.5, 0.5); + !(cell->fill_policy & ETK_BOX_SHRINK_OPPOSITE), + cell->fill_policy & ETK_BOX_FILL, 0.5, 0.5); etk_widget_size_allocate(child, child_geometry); } @@ -1037,7 +1041,7 @@ else { box_widget->focus_order = evas_list_append_relative_list(box_widget->focus_order, - child, box->last_cell[ETK_BOX_START]->focus_node); + child, box->last_cell[ETK_BOX_START]->focus_node); cell->focus_node = evas_list_next(box->last_cell[ETK_BOX_START]->focus_node); } } =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_button.c,v retrieving revision 1.36 retrieving revision 1.37 diff -u -3 -r1.36 -r1.37 --- etk_button.c 23 Feb 2007 03:30:14 -0000 1.36 +++ etk_button.c 14 Mar 2007 05:40:21 -0000 1.37 @@ -69,27 +69,27 @@ if (!button_type) { button_type = etk_type_new("Etk_Button", ETK_BIN_TYPE, sizeof(Etk_Button), - ETK_CONSTRUCTOR(_etk_button_constructor), NULL); + ETK_CONSTRUCTOR(_etk_button_constructor), NULL); _etk_button_signals[ETK_BUTTON_PRESSED_SIGNAL] = etk_signal_new("pressed", - button_type, ETK_MEMBER_OFFSET(Etk_Button, pressed), etk_marshaller_VOID__VOID, NULL, NULL); + button_type, ETK_MEMBER_OFFSET(Etk_Button, pressed), etk_marshaller_VOID__VOID, NULL, NULL); _etk_button_signals[ETK_BUTTON_RELEASED_SIGNAL] = etk_signal_new("released", - button_type, ETK_MEMBER_OFFSET(Etk_Button, released), etk_marshaller_VOID__VOID, NULL, NULL); + button_type, ETK_MEMBER_OFFSET(Etk_Button, released), etk_marshaller_VOID__VOID, NULL, NULL); _etk_button_signals[ETK_BUTTON_CLICKED_SIGNAL] = etk_signal_new("clicked", - button_type, ETK_MEMBER_OFFSET(Etk_Button, clicked), etk_marshaller_VOID__VOID, NULL, NULL); + button_type, ETK_MEMBER_OFFSET(Etk_Button, clicked), etk_marshaller_VOID__VOID, NULL, NULL); etk_type_property_add(button_type, "label", ETK_BUTTON_LABEL_PROPERTY, - ETK_PROPERTY_STRING, ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_string(NULL)); + ETK_PROPERTY_STRING, ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_string(NULL)); etk_type_property_add(button_type, "image", ETK_BUTTON_IMAGE_PROPERTY, - ETK_PROPERTY_POINTER, ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_pointer(NULL)); + ETK_PROPERTY_POINTER, ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_pointer(NULL)); etk_type_property_add(button_type, "xalign", ETK_BUTTON_XALIGN_PROPERTY, - ETK_PROPERTY_FLOAT, ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_float(0.5)); + ETK_PROPERTY_FLOAT, ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_float(0.5)); etk_type_property_add(button_type, "yalign", ETK_BUTTON_YALIGN_PROPERTY, - ETK_PROPERTY_FLOAT, ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_float(0.5)); + ETK_PROPERTY_FLOAT, ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_float(0.5)); etk_type_property_add(button_type, "style", ETK_BUTTON_STYLE_PROPERTY, - ETK_PROPERTY_INT, ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_int(ETK_BUTTON_BOTH_HORIZ)); + ETK_PROPERTY_INT, ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_int(ETK_BUTTON_BOTH_HORIZ)); etk_type_property_add(button_type, "stock_size", ETK_BUTTON_STOCK_SIZE_PROPERTY, - ETK_PROPERTY_INT, ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_int(ETK_STOCK_SMALL)); + ETK_PROPERTY_INT, ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_int(ETK_STOCK_SMALL)); button_type->property_set = _etk_button_property_set; button_type->property_get = _etk_button_property_get; @@ -105,7 +105,7 @@ Etk_Widget *etk_button_new(void) { return etk_widget_new(ETK_BUTTON_TYPE, "theme_group", "button", - "focusable", ETK_TRUE, "focus_on_click", ETK_TRUE, NULL); + "focusable", ETK_TRUE, "focus_on_click", ETK_TRUE, NULL); } /** @@ -114,8 +114,8 @@ */ Etk_Widget *etk_button_new_with_label(const char *label) { - return etk_widget_new(ETK_BUTTON_TYPE, "theme_group", "button", - "label", label, "focusable", ETK_TRUE, "focus_on_click", ETK_TRUE, NULL); + return etk_widget_new(ETK_BUTTON_TYPE, "theme_group", "button", "label", label, + "focusable", ETK_TRUE, "focus_on_click", ETK_TRUE, NULL); } /** @@ -685,7 +685,7 @@ etk_container_add(ETK_CONTAINER(button->alignment), button->box); etk_widget_show(button->box); etk_signal_connect("child_removed", ETK_OBJECT(button->box), - ETK_CALLBACK(_etk_button_image_removed_cb), button); + ETK_CALLBACK(_etk_button_image_removed_cb), button); } else etk_container_remove_all(ETK_CONTAINER(button->box)); =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_cache.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- etk_cache.c 23 Feb 2007 20:44:41 -0000 1.15 +++ etk_cache.c 14 Mar 2007 05:40:21 -0000 1.16 @@ -250,8 +250,7 @@ for (l = cache->cached_objects; l; l = l->next) { item = l->data; - if (strcmp(item->filename, filename) == 0 - && ((!item->key && !key) || (item->key && key && strcmp(item->key, key) == 0))) + if (strcmp(item->filename, filename) == 0 && (strcmp(item->key ? item->key : "", key ? key : "") == 0)) { object = item->object; =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_canvas.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -3 -r1.18 -r1.19 --- etk_canvas.c 23 Feb 2007 20:44:41 -0000 1.18 +++ etk_canvas.c 14 Mar 2007 05:40:21 -0000 1.19 @@ -34,7 +34,7 @@ if (!canvas_type) { canvas_type = etk_type_new("Etk_Canvas", ETK_WIDGET_TYPE, sizeof(Etk_Canvas), - ETK_CONSTRUCTOR(_etk_canvas_constructor), NULL); + ETK_CONSTRUCTOR(_etk_canvas_constructor), NULL); } return canvas_type; =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_check_button.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- etk_check_button.c 23 Feb 2007 20:44:41 -0000 1.9 +++ etk_check_button.c 14 Mar 2007 05:40:21 -0000 1.10 @@ -25,7 +25,7 @@ if (!check_button_type) { check_button_type = etk_type_new("Etk_Check_Button", ETK_TOGGLE_BUTTON_TYPE, - sizeof(Etk_Check_Button), NULL, NULL); + sizeof(Etk_Check_Button), NULL, NULL); } return check_button_type; @@ -38,7 +38,7 @@ Etk_Widget *etk_check_button_new(void) { return etk_widget_new(ETK_CHECK_BUTTON_TYPE, "theme_group", "check_button", - "focusable", ETK_TRUE, "xalign", 0.0, NULL); + "focusable", ETK_TRUE, "xalign", 0.0, NULL); } /** @@ -49,7 +49,7 @@ Etk_Widget *etk_check_button_new_with_label(const char *label) { return etk_widget_new(ETK_CHECK_BUTTON_TYPE, "theme_group", "check_button", - "label", label, "focusable", ETK_TRUE, "xalign", 0.0, NULL); + "label", label, "focusable", ETK_TRUE, "xalign", 0.0, NULL); } /** @} */ =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_colorpicker.c,v retrieving revision 1.29 retrieving revision 1.30 diff -u -3 -r1.29 -r1.30 --- etk_colorpicker.c 24 Feb 2007 20:36:45 -0000 1.29 +++ etk_colorpicker.c 14 Mar 2007 05:40:21 -0000 1.30 @@ -110,15 +110,15 @@ if (!cp_type) { cp_type = etk_type_new("Etk_Colorpicker", ETK_WIDGET_TYPE, sizeof(Etk_Colorpicker), - ETK_CONSTRUCTOR(_etk_colorpicker_constructor), ETK_DESTRUCTOR(_etk_colorpicker_destructor)); + ETK_CONSTRUCTOR(_etk_colorpicker_constructor), ETK_DESTRUCTOR(_etk_colorpicker_destructor)); _etk_colorpicker_signals[ETK_CP_COLOR_CHANGED_SIGNAL] = etk_signal_new("color_changed", - cp_type, -1, etk_marshaller_VOID__VOID, NULL, NULL); + cp_type, -1, etk_marshaller_VOID__VOID, NULL, NULL); etk_type_property_add(cp_type, "color_mode", ETK_CP_MODE_PROPERTY, - ETK_PROPERTY_INT, ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_int(ETK_COLORPICKER_H)); + ETK_PROPERTY_INT, ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_int(ETK_COLORPICKER_H)); etk_type_property_add(cp_type, "use_alpha", ETK_CP_USE_ALPHA_PROPERTY, - ETK_PROPERTY_BOOL, ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_bool(ETK_FALSE)); + ETK_PROPERTY_BOOL, ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_bool(ETK_FALSE)); cp_type->property_set = _etk_colorpicker_property_set; cp_type->property_get = _etk_colorpicker_property_get; @@ -201,10 +201,8 @@ void etk_colorpicker_current_color_set(Etk_Colorpicker *cp, Etk_Color color) { if (cp->current_color.r == color.r && cp->current_color.g == color.g - && cp->current_color.b == color.b && cp->current_color.a == color.a) - { + && cp->current_color.b == color.b && cp->current_color.a == color.a) return; - } cp->ignore_value_changed = ETK_TRUE; etk_range_value_set(ETK_RANGE(cp->sliders[ETK_COLORPICKER_R]), color.r); @@ -297,7 +295,7 @@ cp->current_color.g = 0; cp->current_color.b = 0; cp->current_color.a = 255; - + cp->sp_object = NULL; cp->sp_image = NULL; cp->sp_hcursor = NULL; @@ -350,7 +348,7 @@ cp->radios[i] = etk_radio_button_new_with_label_from_widget(labels[i], ETK_RADIO_BUTTON(cp->radios[0])); etk_widget_internal_set(cp->radios[i], ETK_TRUE); etk_table_attach(ETK_TABLE(cp->component_table), cp->radios[i], 0, 0, i, i, - 0, 0, ETK_TABLE_HFILL | ETK_TABLE_VEXPAND); + 0, 0, ETK_TABLE_HFILL | ETK_TABLE_VEXPAND); etk_widget_show(cp->radios[i]); cp->sliders[i] = etk_hslider_new(0.0, _etk_colorpicker_max_values[i], 0.0, steps[i], steps[i] * 5); @@ -358,19 +356,19 @@ etk_widget_theme_parent_set(cp->sliders[i], ETK_WIDGET(cp)); etk_widget_internal_set(cp->sliders[i], ETK_TRUE); etk_table_attach(ETK_TABLE(cp->component_table), cp->sliders[i], 1, 1, i, i, - 0, 0, ETK_TABLE_HFILL | ETK_TABLE_EXPAND); + 0, 0, ETK_TABLE_HFILL | ETK_TABLE_EXPAND); etk_widget_show(cp->sliders[i]); cp->sliders_image[i] = NULL; etk_signal_connect("toggled", ETK_OBJECT(cp->radios[i]), - ETK_CALLBACK(_etk_colorpicker_radio_toggled_cb), cp); + ETK_CALLBACK(_etk_colorpicker_radio_toggled_cb), cp); etk_signal_connect("realize", ETK_OBJECT(cp->sliders[i]), - ETK_CALLBACK(_etk_colorpicker_slider_realize_cb), cp); + ETK_CALLBACK(_etk_colorpicker_slider_realize_cb), cp); etk_signal_connect("unrealize", ETK_OBJECT(cp->sliders[i]), - ETK_CALLBACK(_etk_colorpicker_slider_unrealize_cb), cp); + ETK_CALLBACK(_etk_colorpicker_slider_unrealize_cb), cp); etk_signal_connect("value_changed", ETK_OBJECT(cp->sliders[i]), - ETK_CALLBACK(_etk_colorpicker_slider_value_changed_cb), cp); + ETK_CALLBACK(_etk_colorpicker_slider_value_changed_cb), cp); } /* Alpha slider */ @@ -378,16 +376,16 @@ cp->alpha_label = etk_label_new(_("Alpha")); etk_widget_internal_set(cp->alpha_label, ETK_TRUE); etk_table_attach(ETK_TABLE(cp->component_table), cp->alpha_label, 0, 0, 6, 6, - 0, 0, ETK_TABLE_HFILL | ETK_TABLE_VEXPAND); + 0, 0, ETK_TABLE_HFILL | ETK_TABLE_VEXPAND); cp->alpha_slider = etk_hslider_new(0.0, 255.0, 255.0, 10, 5.0); etk_slider_label_set(ETK_SLIDER(cp->alpha_slider), "%.0f"); etk_widget_internal_set(cp->alpha_slider, ETK_TRUE); etk_table_attach(ETK_TABLE(cp->component_table), cp->alpha_slider, 1, 1, 6, 6, - 0, 0, ETK_TABLE_HFILL | ETK_TABLE_EXPAND); + 0, 0, ETK_TABLE_HFILL | ETK_TABLE_EXPAND); etk_signal_connect("value_changed", ETK_OBJECT(cp->alpha_slider), - ETK_CALLBACK(_etk_colorpicker_alpha_slider_value_changed_cb), cp); + ETK_CALLBACK(_etk_colorpicker_alpha_slider_value_changed_cb), cp); } /* We create the widgets for the color preview */ @@ -395,29 +393,31 @@ etk_widget_padding_set(cp->color_table, 3, 3, 3, 3); etk_widget_internal_set(cp->color_table, ETK_TRUE); etk_table_attach(ETK_TABLE(cp->main_table), cp->color_table, 0, 0, 1, 1, - 0, 0, ETK_TABLE_FILL | ETK_TABLE_HEXPAND); + 0, 0, ETK_TABLE_FILL | ETK_TABLE_HEXPAND); etk_widget_show(cp->color_table); /* Current color preview */ cp->current_color_label = etk_label_new(_("Current")); etk_widget_internal_set(cp->current_color_label, ETK_TRUE); etk_table_attach(ETK_TABLE(cp->color_table), cp->current_color_label, 0, 0, 0, 0, - 0, 0, ETK_TABLE_HFILL); + 0, 0, ETK_TABLE_HFILL); etk_widget_show(cp->current_color_label); cp->current_color_widget = etk_widget_new(ETK_WIDGET_TYPE, "theme_group", "color_preview", NULL); etk_widget_theme_parent_set(cp->current_color_widget, ETK_WIDGET(cp)); etk_widget_internal_set(cp->current_color_widget, ETK_TRUE); etk_table_attach(ETK_TABLE(cp->color_table), cp->current_color_widget, 1, 1, 0, 0, - 0, 0, ETK_TABLE_HFILL | ETK_TABLE_HEXPAND); + 0, 0, ETK_TABLE_HFILL | ETK_TABLE_HEXPAND); etk_widget_show(cp->current_color_widget); - etk_signal_connect("realize", ETK_OBJECT(cp->picker_widget), ETK_CALLBACK(_etk_colorpicker_realize_cb), cp); - etk_signal_connect("unrealize", ETK_OBJECT(cp->picker_widget), ETK_CALLBACK(_etk_colorpicker_unrealize_cb), cp); + etk_signal_connect("realize", ETK_OBJECT(cp->picker_widget), + ETK_CALLBACK(_etk_colorpicker_realize_cb), cp); + etk_signal_connect("unrealize", ETK_OBJECT(cp->picker_widget), + ETK_CALLBACK(_etk_colorpicker_unrealize_cb), cp); etk_signal_connect("realize", ETK_OBJECT(cp->current_color_widget), - ETK_CALLBACK(_etk_colorpicker_current_color_realize_cb), cp); + ETK_CALLBACK(_etk_colorpicker_current_color_realize_cb), cp); etk_signal_connect("unrealize", ETK_OBJECT(cp->current_color_widget), - ETK_CALLBACK(_etk_colorpicker_current_color_unrealize_cb), cp); + ETK_CALLBACK(_etk_colorpicker_current_color_unrealize_cb), cp); ETK_WIDGET(cp)->size_request = _etk_colorpicker_size_request; @@ -621,7 +621,9 @@ Evas *evas; int i; - if (!(slider = ETK_WIDGET(object)) || !(cp = ETK_COLORPICKER(data)) || !(evas = etk_widget_toplevel_evas_get(slider))) + if (!(slider = ETK_WIDGET(object)) || !(cp = ETK_COLORPICKER(data))) + return; + if (!(evas = etk_widget_toplevel_evas_get(slider))) return; for (i = 0; i < 6; i++) @@ -633,7 +635,7 @@ evas_object_image_size_set(cp->sliders_image[i], cp->sliders_res, 1); evas_object_show(cp->sliders_image[i]); evas_object_event_callback_add(cp->sliders_image[i], EVAS_CALLBACK_RESIZE, - _etk_colorpicker_slider_image_resize_cb, NULL); + _etk_colorpicker_slider_image_resize_cb, NULL); etk_widget_swallow_object(slider, "etk.swallow.image", cp->sliders_image[i]); _etk_colorpicker_update(cp, ETK_FALSE, ETK_FALSE, ETK_FALSE, ETK_FALSE); @@ -1104,9 +1106,9 @@ cp->ignore_value_changed = ETK_TRUE; etk_range_value_set(ETK_RANGE(cp->sliders[cp->sp_xcomponent]), - xpercent * _etk_colorpicker_max_values[cp->sp_xcomponent]); + xpercent * _etk_colorpicker_max_values[cp->sp_xcomponent]); etk_range_value_set(ETK_RANGE(cp->sliders[cp->sp_ycomponent]), - ypercent * _etk_colorpicker_max_values[cp->sp_ycomponent]); + ypercent * _etk_colorpicker_max_values[cp->sp_ycomponent]); cp->ignore_value_changed = ETK_FALSE; _etk_colorpicker_update_from_sliders(cp, cp->mode, ETK_FALSE, ETK_FALSE); =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_combobox.c,v retrieving revision 1.41 retrieving revision 1.42 diff -u -3 -r1.41 -r1.42 --- etk_combobox.c 10 Mar 2007 03:18:35 -0000 1.41 +++ etk_combobox.c 14 Mar 2007 05:40:21 -0000 1.42 @@ -79,15 +79,15 @@ if (!combobox_type) { combobox_type = etk_type_new("Etk_Combobox", ETK_WIDGET_TYPE, sizeof(Etk_Combobox), - ETK_CONSTRUCTOR(_etk_combobox_constructor), ETK_DESTRUCTOR(_etk_combobox_destructor)); + ETK_CONSTRUCTOR(_etk_combobox_constructor), ETK_DESTRUCTOR(_etk_combobox_destructor)); _etk_combobox_signals[ETK_COMBOBOX_ACTIVE_ITEM_CHANGED_SIGNAL] = etk_signal_new("active_item_changed", - combobox_type, -1, etk_marshaller_VOID__VOID, NULL, NULL); + combobox_type, -1, etk_marshaller_VOID__VOID, NULL, NULL); etk_type_property_add(combobox_type, "items_height", ETK_COMBOBOX_ITEMS_HEIGHT_PROPERTY, - ETK_PROPERTY_INT, ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_int(DEFAULT_ITEM_HEIGHT)); + ETK_PROPERTY_INT, ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_int(DEFAULT_ITEM_HEIGHT)); etk_type_property_add(combobox_type, "active_item", ETK_COMBOBOX_ACTIVE_ITEM_PROPERTY, - ETK_PROPERTY_POINTER, ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_pointer(NULL)); + ETK_PROPERTY_POINTER, ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_pointer(NULL)); combobox_type->property_set = _etk_combobox_property_set; combobox_type->property_get = _etk_combobox_property_get; @@ -108,7 +108,7 @@ if (!combobox_item_type) { combobox_item_type = etk_type_new("Etk_Combobox_Item", ETK_WIDGET_TYPE, sizeof(Etk_Combobox_Item), - ETK_CONSTRUCTOR(_etk_combobox_item_constructor), ETK_DESTRUCTOR(_etk_combobox_item_destructor)); + ETK_CONSTRUCTOR(_etk_combobox_item_constructor), ETK_DESTRUCTOR(_etk_combobox_item_destructor)); } return combobox_item_type; @@ -121,7 +121,7 @@ Etk_Widget *etk_combobox_new(void) { return etk_widget_new(ETK_COMBOBOX_TYPE, "theme_group", "combobox", - "focusable", ETK_TRUE, "focus_on_click", ETK_TRUE, NULL); + "focusable", ETK_TRUE, "focus_on_click", ETK_TRUE, NULL); } /** @@ -215,7 +215,7 @@ return; combobox->active_item_widget = etk_widget_new(ETK_WIDGET_TYPE, "pass_mouse_events", ETK_TRUE, - "visible", ETK_TRUE, "internal", ETK_TRUE, NULL); + "visible", ETK_TRUE, "internal", ETK_TRUE, NULL); combobox->active_item_widget->size_request = _etk_combobox_active_item_size_request; combobox->active_item_widget->size_allocate = _etk_combobox_active_item_size_allocate; etk_object_data_set(ETK_OBJECT(combobox->active_item_widget), "_Etk_Combobox_Window::Combobox", combobox); @@ -363,7 +363,7 @@ if (after && combobox != after->combobox) { ETK_WARNING("Unable to add a new item after item %p because this item does not belong to the combobox " - "in which the new item should be added", after); + "in which the new item should be added", after); return NULL; } @@ -571,7 +571,7 @@ if ((item && item->combobox != combobox) || !combobox->built) { ETK_WARNING("Unable to change the active-item of the combobox. The specified item does not belong " - "to the combobox or the combobox is not built yet."); + "to the combobox or the combobox is not built yet."); return; } @@ -770,12 +770,12 @@ return; combobox->button = etk_widget_new(ETK_TOGGLE_BUTTON_TYPE, "theme_group", "button", "theme_parent", combobox, - "visible", ETK_TRUE, "repeat_mouse_events", ETK_TRUE, "focusable", ETK_FALSE, "internal", ETK_TRUE, NULL); + "visible", ETK_TRUE, "repeat_mouse_events", ETK_TRUE, "focusable", ETK_FALSE, "internal", ETK_TRUE, NULL); etk_widget_parent_set(combobox->button, ETK_WIDGET(combobox)); etk_signal_connect("toggled", ETK_OBJECT(combobox->button), ETK_CALLBACK(_etk_combobox_button_toggled_cb), combobox); combobox->window = ETK_POPUP_WINDOW(etk_widget_new(ETK_POPUP_WINDOW_TYPE, - "theme_group", "window", "theme_parent", combobox, NULL)); + "theme_group", "window", "theme_parent", combobox, NULL)); etk_object_data_set(ETK_OBJECT(combobox->window), "_Etk_Combobox_Window::Combobox", combobox); etk_signal_connect("popped_down", ETK_OBJECT(combobox->window), ETK_CALLBACK(_etk_combobox_window_popped_down_cb), combobox); etk_signal_connect("key_down", ETK_OBJECT(combobox->window), ETK_CALLBACK(_etk_combobox_window_key_down_cb), combobox); @@ -1113,8 +1113,8 @@ etk_toplevel_evas_position_get(toplevel, &ex, &ey); etk_toplevel_screen_position_get(toplevel, &sx, &sy); etk_popup_window_popup_at_xy(combobox->window, - sx + (bx - ex) + combobox->popup_offset_x, - sy + (by - ey) + bh + combobox->popup_offset_y); + sx + (bx - ex) + combobox->popup_offset_x, + sy + (by - ey) + bh + combobox->popup_offset_y); etk_window_resize(ETK_WINDOW(combobox->window), bw + combobox->popup_extra_w, 0); } } @@ -1158,7 +1158,7 @@ _etk_combobox_selected_item_set(combobox, combobox->selected_item->prev); } else if (strcmp(event->keyname, "Return") == 0 || strcmp(event->keyname, "space") == 0 - || strcmp(event->keyname, "KP_Enter") == 0) + || strcmp(event->keyname, "KP_Enter") == 0) { if (combobox->selected_item) { @@ -1277,7 +1277,7 @@ if (combobox->cols[i]->fill_policy & ETK_COMBOBOX_EXPAND) { col_geometry.w = (combobox->cols[i]->width / (float)expandable_width) * - (geometry.w - (total_width - expandable_width)); + (geometry.w - (total_width - expandable_width)); } else col_geometry.w = combobox->cols[i]->width; @@ -1287,7 +1287,7 @@ { child_geometry = col_geometry; etk_container_child_space_fill(cells[i], &child_geometry, - combobox->cols[i]->fill_policy & ETK_COMBOBOX_FILL, ETK_TRUE, combobox->cols[i]->align, 0.5); + combobox->cols[i]->fill_policy & ETK_COMBOBOX_FILL, ETK_TRUE, combobox->cols[i]->align, 0.5); etk_widget_size_allocate(cells[i], child_geometry); } col_geometry.x += col_geometry.w; =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_container.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- etk_container.c 23 Feb 2007 21:40:04 -0000 1.13 +++ etk_container.c 14 Mar 2007 05:40:21 -0000 1.14 @@ -47,15 +47,15 @@ if (!container_type) { container_type = etk_type_new("Etk_Container", ETK_WIDGET_TYPE, sizeof(Etk_Container), - ETK_CONSTRUCTOR(_etk_container_constructor), ETK_DESTRUCTOR(_etk_container_destructor)); + ETK_CONSTRUCTOR(_etk_container_constructor), ETK_DESTRUCTOR(_etk_container_destructor)); _etk_container_signals[ETK_CONTAINER_CHILD_ADDED_SIGNAL] = etk_signal_new("child_added", - container_type, -1, etk_marshaller_VOID__POINTER, NULL, NULL); + container_type, -1, etk_marshaller_VOID__POINTER, NULL, NULL); _etk_container_signals[ETK_CONTAINER_CHILD_REMOVED_SIGNAL] = etk_signal_new("child_removed", - container_type, -1, etk_marshaller_VOID__POINTER, NULL, NULL); + container_type, -1, etk_marshaller_VOID__POINTER, NULL, NULL); etk_type_property_add(container_type, "border_width", ETK_CONTAINER_BORDER_WIDTH_PROPERTY, - ETK_PROPERTY_INT, ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_int(0)); + ETK_PROPERTY_INT, ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_int(0)); container_type->property_set = _etk_container_property_set; container_type->property_get = _etk_container_property_get; @@ -266,7 +266,7 @@ return; /* We need to do that because Etk_Widget's destructor may - * still want to access those methods */ + * still want to access those methods (TODO: not when parent_set will be fixed...) */ container->child_add = NULL; container->child_remove = NULL; container->children_get = NULL; =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_dialog.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -3 -r1.19 -r1.20 --- etk_dialog.c 10 Mar 2007 03:36:30 -0000 1.19 +++ etk_dialog.c 14 Mar 2007 05:40:21 -0000 1.20 @@ -53,17 +53,17 @@ if (!dialog_type) { dialog_type = etk_type_new("Etk_Dialog", ETK_WINDOW_TYPE, sizeof(Etk_Dialog), - ETK_CONSTRUCTOR(_etk_dialog_constructor), NULL); + ETK_CONSTRUCTOR(_etk_dialog_constructor), NULL); _etk_dialog_signals[ETK_DIALOG_RESPONSE_SIGNAL] = etk_signal_new("response", - dialog_type, -1, etk_marshaller_VOID__INT, NULL, NULL); + dialog_type, -1, etk_marshaller_VOID__INT, NULL, NULL); etk_type_property_add(dialog_type, "has_separator", ETK_DIALOG_HAS_SEPARATOR_PROPERTY, - ETK_PROPERTY_BOOL, ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_bool(ETK_TRUE)); + ETK_PROPERTY_BOOL, ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_bool(ETK_TRUE)); etk_type_property_add(dialog_type, "action_area_homogeneous", ETK_DIALOG_ACTION_AREA_HOMOGENEOUS_PROPERTY, - ETK_PROPERTY_BOOL, ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_bool(ETK_TRUE)); + ETK_PROPERTY_BOOL, ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_bool(ETK_TRUE)); etk_type_property_add(dialog_type, "action_area_align", ETK_DIALOG_ACTION_AREA_ALIGN_PROPERTY, - ETK_PROPERTY_FLOAT, ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_float(0.5)); + ETK_PROPERTY_FLOAT, ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_float(0.5)); dialog_type->property_set = _etk_dialog_property_set; dialog_type->property_get = _etk_dialog_property_get; =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_embed.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- etk_embed.c 10 Mar 2007 18:19:21 -0000 1.6 +++ etk_embed.c 14 Mar 2007 05:40:21 -0000 1.7 @@ -36,7 +36,7 @@ if (!embed_type) { embed_type = etk_type_new("Etk_Embed", ETK_TOPLEVEL_TYPE, sizeof(Etk_Embed), - ETK_CONSTRUCTOR(_etk_embed_constructor), NULL); + ETK_CONSTRUCTOR(_etk_embed_constructor), NULL); } return embed_type; |