From: Enlightenment C. <no...@cv...> - 2007-04-02 09:48:35
|
Enlightenment CVS committal Author : moom Project : e17 Module : libs/etk Dir : e17/libs/etk/src/lib Modified Files: etk_alignment.h etk_bin.h etk_box.h etk_button.c etk_cache.h etk_canvas.h etk_check_button.h etk_colorpicker.h etk_combobox.c etk_combobox.h etk_config.c etk_config.h etk_container.h etk_dialog.h etk_drag.c etk_drag.h etk_editable.h etk_embed.h etk_engine.c etk_engine.h etk_event.c etk_event.h etk_filechooser_widget.c etk_filechooser_widget.h etk_fixed.h etk_iconbox.c etk_iconbox.h etk_image.h etk_label.c etk_label.h etk_main.c etk_main.h etk_menu.c etk_menu.h etk_menu_bar.c etk_menu_bar.h etk_menu_item.c etk_menu_item.h etk_menu_shell.h etk_message_dialog.c etk_message_dialog.h etk_notebook.h etk_object.h etk_paned.h etk_popup_window.c etk_popup_window.h etk_progress_bar.c etk_progress_bar.h etk_property.c etk_property.h etk_range.h etk_scrollbar.c etk_scrollbar.h etk_scrolled_view.c etk_scrolled_view.h etk_selection.h etk_separator.c etk_separator.h etk_shadow.c etk_shadow.h etk_signal_callback.h etk_slider.h etk_spinner.c etk_spinner.h etk_statusbar.c etk_statusbar.h etk_string.c etk_string.h etk_table.h etk_theme.h etk_toplevel.c etk_toplevel.h etk_tree.c etk_tree.h etk_tree_model.c etk_tree_model.h etk_type.c etk_type.h etk_viewport.c etk_viewport.h etk_widget.h etk_window.h Log Message: * Formatting and cleanup =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_alignment.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- etk_alignment.h 22 Feb 2007 22:24:25 -0000 1.5 +++ etk_alignment.h 2 Apr 2007 09:48:29 -0000 1.6 @@ -40,8 +40,8 @@ Etk_Type *etk_alignment_type_get(void); Etk_Widget *etk_alignment_new(float xalign, float yalign, float xscale, float yscale); -void etk_alignment_set(Etk_Alignment *alignment, float xalign, float yalign, float xscale, float yscale); -void etk_alignment_get(Etk_Alignment *alignment, float *xalign, float *yalign, float *xscale, float *yscale); +void etk_alignment_set(Etk_Alignment *alignment, float xalign, float yalign, float xscale, float yscale); +void etk_alignment_get(Etk_Alignment *alignment, float *xalign, float *yalign, float *xscale, float *yscale); /** @} */ =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_bin.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- etk_bin.h 22 Feb 2007 22:24:25 -0000 1.11 +++ etk_bin.h 2 Apr 2007 09:48:29 -0000 1.12 @@ -33,8 +33,7 @@ }; -Etk_Type *etk_bin_type_get(void); - +Etk_Type *etk_bin_type_get(void); void etk_bin_child_set(Etk_Bin *bin, Etk_Widget *child); Etk_Widget *etk_bin_child_get(Etk_Bin *bin); =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_box.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- etk_box.h 10 Mar 2007 00:57:58 -0000 1.11 +++ etk_box.h 2 Apr 2007 09:48:29 -0000 1.12 @@ -116,17 +116,17 @@ }; -Etk_Type *etk_box_type_get(void); -Etk_Type *etk_hbox_type_get(void); -Etk_Type *etk_vbox_type_get(void); +Etk_Type *etk_box_type_get(void); +Etk_Type *etk_hbox_type_get(void); +Etk_Type *etk_vbox_type_get(void); Etk_Widget *etk_hbox_new(Etk_Bool homogeneous, int spacing); Etk_Widget *etk_vbox_new(Etk_Bool homogeneous, int spacing); -void etk_box_prepend(Etk_Box *box, Etk_Widget *child, Etk_Box_Group group, Etk_Box_Fill_Policy fill_policy, int padding); -void etk_box_append(Etk_Box *box, Etk_Widget *child, Etk_Box_Group group, Etk_Box_Fill_Policy fill_policy, int padding); -void etk_box_insert(Etk_Box *box, Etk_Widget *child, Etk_Box_Group group, Etk_Widget *after, Etk_Box_Fill_Policy fill_policy, int padding); -void etk_box_insert_at(Etk_Box *box, Etk_Widget *child, Etk_Box_Group group, int pos, Etk_Box_Fill_Policy fill_policy, int padding); +void etk_box_prepend(Etk_Box *box, Etk_Widget *child, Etk_Box_Group group, Etk_Box_Fill_Policy fill_policy, int padding); +void etk_box_append(Etk_Box *box, Etk_Widget *child, Etk_Box_Group group, Etk_Box_Fill_Policy fill_policy, int padding); +void etk_box_insert(Etk_Box *box, Etk_Widget *child, Etk_Box_Group group, Etk_Widget *after, Etk_Box_Fill_Policy fill_policy, int padding); +void etk_box_insert_at(Etk_Box *box, Etk_Widget *child, Etk_Box_Group group, int pos, Etk_Box_Fill_Policy fill_policy, int padding); Etk_Widget *etk_box_child_get_at(Etk_Box *box, Etk_Box_Group group, int pos); void etk_box_child_position_set(Etk_Box *box, Etk_Widget *child, Etk_Box_Group group, int pos); @@ -134,10 +134,10 @@ void etk_box_child_packing_set(Etk_Box *box, Etk_Widget *child, Etk_Box_Fill_Policy fill_policy, int padding); Etk_Bool etk_box_child_packing_get(Etk_Box *box, Etk_Widget *child, Etk_Box_Fill_Policy *fill_policy, int *padding); -void etk_box_spacing_set(Etk_Box *box, int spacing); -int etk_box_spacing_get(Etk_Box *box); -void etk_box_homogeneous_set(Etk_Box *box, Etk_Bool homogeneous); -Etk_Bool etk_box_homogeneous_get(Etk_Box *box); +void etk_box_spacing_set(Etk_Box *box, int spacing); +int etk_box_spacing_get(Etk_Box *box); +void etk_box_homogeneous_set(Etk_Box *box, Etk_Bool homogeneous); +Etk_Bool etk_box_homogeneous_get(Etk_Box *box); /** @} */ =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_button.c,v retrieving revision 1.40 retrieving revision 1.41 diff -u -3 -r1.40 -r1.41 --- etk_button.c 1 Apr 2007 19:09:31 -0000 1.40 +++ etk_button.c 2 Apr 2007 09:48:29 -0000 1.41 @@ -246,7 +246,7 @@ if (button->image) { button->ignore_image_remove = ETK_TRUE; - etk_object_destroy(ETK_OBJECT(button->image)); + etk_widget_parent_set(ETK_WIDGET(button->image), NULL); button->ignore_image_remove = ETK_FALSE; } =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_cache.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- etk_cache.h 23 Feb 2007 03:30:14 -0000 1.7 +++ etk_cache.h 2 Apr 2007 09:48:29 -0000 1.8 @@ -11,6 +11,7 @@ * @{ */ + /** * @brief A system used to cache image objects for widgets that frequently need to load images * @structinfo @@ -26,14 +27,14 @@ }; -Etk_Cache *etk_cache_new(int size); -void etk_cache_destroy(Etk_Cache *cache); -void etk_cache_clear(Etk_Cache *cache); +Etk_Cache *etk_cache_new(int size); +void etk_cache_destroy(Etk_Cache *cache); +void etk_cache_clear(Etk_Cache *cache); -void etk_cache_free_callback_set(Etk_Cache *cache, void (*free_cb)(Evas_Object *object, void *data), void *data); -void etk_cache_size_set(Etk_Cache *cache, int size); -int etk_cache_size_get(Etk_Cache *cache); -int etk_cache_num_objects_get(Etk_Cache *cache); +void etk_cache_free_callback_set(Etk_Cache *cache, void (*free_cb)(Evas_Object *object, void *data), void *data); +void etk_cache_size_set(Etk_Cache *cache, int size); +int etk_cache_size_get(Etk_Cache *cache); +int etk_cache_num_objects_get(Etk_Cache *cache); void etk_cache_add(Etk_Cache *cache, Evas_Object *object, const char *filename, const char *key); void etk_cache_remove(Etk_Cache *cache, Evas_Object *object); =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_canvas.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- etk_canvas.h 23 Feb 2007 20:44:41 -0000 1.8 +++ etk_canvas.h 2 Apr 2007 09:48:29 -0000 1.9 @@ -38,10 +38,10 @@ Etk_Type *etk_canvas_type_get(void); Etk_Widget *etk_canvas_new(void); -Etk_Bool etk_canvas_object_add(Etk_Canvas *canvas, Evas_Object *object); -void etk_canvas_object_remove(Etk_Canvas *canvas, Evas_Object *object); -void etk_canvas_object_move(Etk_Canvas *canvas, Evas_Object *object, int x, int y); -void etk_canvas_object_geometry_get(Etk_Canvas *canvas, Evas_Object *object, int *x, int *y, int *w, int *h); +Etk_Bool etk_canvas_object_add(Etk_Canvas *canvas, Evas_Object *object); +void etk_canvas_object_remove(Etk_Canvas *canvas, Evas_Object *object); +void etk_canvas_object_move(Etk_Canvas *canvas, Evas_Object *object, int x, int y); +void etk_canvas_object_geometry_get(Etk_Canvas *canvas, Evas_Object *object, int *x, int *y, int *w, int *h); /** @} */ =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_check_button.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- etk_check_button.h 23 Feb 2007 20:44:41 -0000 1.5 +++ etk_check_button.h 2 Apr 2007 09:48:29 -0000 1.6 @@ -18,6 +18,7 @@ /** Checks if the object is an Etk_Check_Button */ #define ETK_IS_CHECK_BUTTON(obj) (ETK_OBJECT_CHECK_TYPE((obj), ETK_CHECK_BUTTON_TYPE)) + /** * @brief @widget A toggle button made up of a checkbox and a label * @structinfo =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_colorpicker.h,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- etk_colorpicker.h 8 Mar 2007 18:16:01 -0000 1.15 +++ etk_colorpicker.h 2 Apr 2007 09:48:29 -0000 1.16 @@ -101,8 +101,8 @@ }; -Etk_Type *etk_colorpicker_type_get(void); -Etk_Widget *etk_colorpicker_new(void); +Etk_Type *etk_colorpicker_type_get(void); +Etk_Widget *etk_colorpicker_new(void); void etk_colorpicker_mode_set(Etk_Colorpicker *cp, Etk_Colorpicker_Mode mode); Etk_Colorpicker_Mode etk_colorpicker_mode_get(Etk_Colorpicker *cp); =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_combobox.c,v retrieving revision 1.45 retrieving revision 1.46 diff -u -3 -r1.45 -r1.46 --- etk_combobox.c 25 Mar 2007 18:22:00 -0000 1.45 +++ etk_combobox.c 2 Apr 2007 09:48:29 -0000 1.46 @@ -560,6 +560,47 @@ } /** + * @brief Sets the data associated to the combobox item + * @param item a combobox item + * @param data the data to associate to the combobox item + */ +void etk_combobox_item_data_set(Etk_Combobox_Item *item, void *data) +{ + if (!item) + return; + etk_combobox_item_data_set_full(item, data, NULL); +} + +/** + * @brief Sets the data associated to the combobox item + * @param item a combobox item + * @param data the data to associate to the combobox item + * @param free_cb a function to call to free the data when the item is destroyed or when the data is changed + */ +void etk_combobox_item_data_set_full(Etk_Combobox_Item *item, void *data, void (*free_cb)(void *data)) +{ + if (!item) + return; + + if (item->data_free_cb && item->data && (item->data != data)) + item->data_free_cb(item->data); + item->data = data; + item->data_free_cb = free_cb; +} + +/** + * @brief Gets the data associated to the combobox item + * @param item a combobox item + * @return Returns the data associated to the combobox item + */ +void *etk_combobox_item_data_get(Etk_Combobox_Item *item) +{ + if (!item) + return NULL; + return item->data; +} + +/** * @brief Sets the active item of the combobox * @param combobox a combobox * @param item the item to set as active @@ -716,47 +757,6 @@ if (!item) return NULL; return item->combobox; -} - -/** - * @brief Sets the data associated to the combobox item - * @param item a combobox item - * @param data the data to associate to the combobox item - */ -void etk_combobox_item_data_set(Etk_Combobox_Item *item, void *data) -{ - if (!item) - return; - etk_combobox_item_data_set_full(item, data, NULL); -} - -/** - * @brief Sets the data associated to the combobox item - * @param item a combobox item - * @param data the data to associate to the combobox item - * @param free_cb a function to call to free the data when the item is destroyed or when the data is changed - */ -void etk_combobox_item_data_set_full(Etk_Combobox_Item *item, void *data, void (*free_cb)(void *data)) -{ - if (!item) - return; - - if (item->data_free_cb && item->data && (item->data != data)) - item->data_free_cb(item->data); - item->data = data; - item->data_free_cb = free_cb; -} - -/** - * @brief Gets the data associated to the combobox item - * @param item a combobox item - * @return Returns the data associated to the combobox item - */ -void *etk_combobox_item_data_get(Etk_Combobox_Item *item) -{ - if (!item) - return NULL; - return item->data; } /************************** =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_combobox.h,v retrieving revision 1.19 retrieving revision 1.20 diff -u -3 -r1.19 -r1.20 --- etk_combobox.h 10 Mar 2007 03:18:35 -0000 1.19 +++ etk_combobox.h 2 Apr 2007 09:48:29 -0000 1.20 @@ -120,17 +120,16 @@ }; -Etk_Type *etk_combobox_type_get(void); -Etk_Type *etk_combobox_item_type_get(void); +Etk_Type *etk_combobox_type_get(void); +Etk_Type *etk_combobox_item_type_get(void); -Etk_Widget *etk_combobox_new(void); -Etk_Widget *etk_combobox_new_default(void); +Etk_Widget *etk_combobox_new(void); +Etk_Widget *etk_combobox_new_default(void); +void etk_combobox_items_height_set(Etk_Combobox *combobox, int items_height); +int etk_combobox_items_height_get(Etk_Combobox *combobox); -void etk_combobox_items_height_set(Etk_Combobox *combobox, int items_height); -int etk_combobox_items_height_get(Etk_Combobox *combobox); - -void etk_combobox_column_add(Etk_Combobox *combobox, Etk_Combobox_Column_Type col_type, int width, Etk_Combobox_Fill_Policy fill_policy, float align); -void etk_combobox_build(Etk_Combobox *combobox); +void etk_combobox_column_add(Etk_Combobox *combobox, Etk_Combobox_Column_Type col_type, int width, Etk_Combobox_Fill_Policy fill_policy, float align); +void etk_combobox_build(Etk_Combobox *combobox); Etk_Combobox_Item *etk_combobox_item_prepend(Etk_Combobox *combobox, ...); Etk_Combobox_Item *etk_combobox_item_append(Etk_Combobox *combobox, ...); @@ -139,10 +138,14 @@ void etk_combobox_item_remove(Etk_Combobox_Item *item); void etk_combobox_clear(Etk_Combobox *combobox); -void etk_combobox_item_fields_set(Etk_Combobox_Item *item, ...); -void etk_combobox_item_fields_set_valist(Etk_Combobox_Item *item, va_list args); -void etk_combobox_item_fields_get(Etk_Combobox_Item *item, ...); -void etk_combobox_item_fields_get_valist(Etk_Combobox_Item *item, va_list args); +void etk_combobox_item_fields_set(Etk_Combobox_Item *item, ...); +void etk_combobox_item_fields_set_valist(Etk_Combobox_Item *item, va_list args); +void etk_combobox_item_fields_get(Etk_Combobox_Item *item, ...); +void etk_combobox_item_fields_get_valist(Etk_Combobox_Item *item, va_list args); + +void etk_combobox_item_data_set(Etk_Combobox_Item *item, void *data); +void etk_combobox_item_data_set_full(Etk_Combobox_Item *item, void *data, void (*free_cb)(void *data)); +void *etk_combobox_item_data_get(Etk_Combobox_Item *item); void etk_combobox_active_item_set(Etk_Combobox *combobox, Etk_Combobox_Item *item); Etk_Combobox_Item *etk_combobox_active_item_get(Etk_Combobox *combobox); @@ -154,10 +157,6 @@ Etk_Combobox_Item *etk_combobox_item_next_get(Etk_Combobox_Item *item); Etk_Combobox_Item *etk_combobox_nth_item_get(Etk_Combobox *combobox, int index); Etk_Combobox *etk_combobox_item_combobox_get(Etk_Combobox_Item *item); - -void etk_combobox_item_data_set(Etk_Combobox_Item *item, void *data); -void etk_combobox_item_data_set_full(Etk_Combobox_Item *item, void *data, void (*free_cb)(void *data)); -void *etk_combobox_item_data_get(Etk_Combobox_Item *item); /** @} */ =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_config.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- etk_config.c 8 Oct 2006 10:11:59 -0000 1.2 +++ etk_config.c 2 Apr 2007 09:48:29 -0000 1.3 @@ -72,7 +72,7 @@ * @brief Initializes the config system * @return Returns true if initialization was successful, false otherwise */ -Etk_Bool etk_config_init() +Etk_Bool etk_config_init(void) { char *home; char buf[PATH_MAX]; @@ -135,7 +135,7 @@ /** * @brief Shutdowns the config system */ -void etk_config_shutdown() +void etk_config_shutdown(void) { FREED(_etk_config_gen_edd); FREED(_etk_config_ver_edd); @@ -157,7 +157,7 @@ * @brief Loads Etk's config from disk * @return Returns ETK_TRUE on a successful load, ETK_FALSE otherwise. */ -Etk_Bool etk_config_load() +Etk_Bool etk_config_load(void) { Eet_File *ef; char buf[PATH_MAX]; @@ -237,7 +237,7 @@ * @brief Saves Etk's config to disk * @return Returns ETK_TRUE on a successful save, ETK_FALSE otherwise. */ -Etk_Bool etk_config_save() +Etk_Bool etk_config_save(void) { Eet_File *ef; char buf[PATH_MAX]; @@ -272,7 +272,7 @@ * @brief Get Etk's current widget theme * @return Returns the current widget theme used by Etk */ -const char *etk_config_widget_theme_get() +const char *etk_config_widget_theme_get(void) { if (!_etk_config || !_etk_config->general) return NULL; @@ -297,7 +297,7 @@ * @brief Get Etk's current font * @return Returns the current font used by Etk */ -const char *etk_config_font_get() +const char *etk_config_font_get(void) { if (!_etk_config || !_etk_config->general) return NULL; @@ -322,7 +322,7 @@ * @brief Get Etk's current engine * @return Returns the current engine used by Etk */ -const char *etk_config_engine_get() +const char *etk_config_engine_get(void) { if (!_etk_config || !_etk_config->general) return NULL; @@ -343,7 +343,7 @@ } /* applies the default configuration */ -static void _etk_config_defaults_apply() +static void _etk_config_defaults_apply(void) { if (_etk_config) { =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_config.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- etk_config.h 31 Aug 2006 17:33:58 -0000 1.1 +++ etk_config.h 2 Apr 2007 09:48:29 -0000 1.2 @@ -11,20 +11,20 @@ * @{ */ -Etk_Bool etk_config_init(); -void etk_config_shutdown(); +Etk_Bool etk_config_init(void); +void etk_config_shutdown(void); -Etk_Bool etk_config_load(); -Etk_Bool etk_config_save(); +Etk_Bool etk_config_load(void); +Etk_Bool etk_config_save(void); -const char *etk_config_widget_theme_get(); -void etk_config_widget_theme_set(const char *widget_theme); +const char *etk_config_widget_theme_get(void); +void etk_config_widget_theme_set(const char *widget_theme); -const char *etk_config_font_get(); -void etk_config_font_set(const char *font); +const char *etk_config_font_get(void); +void etk_config_font_set(const char *font); -const char *etk_config_engine_get(); -void etk_config_engine_set(const char *engine); +const char *etk_config_engine_get(void); +void etk_config_engine_set(const char *engine); /** @} */ =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_container.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- etk_container.h 25 Mar 2007 18:22:00 -0000 1.11 +++ etk_container.h 2 Apr 2007 09:48:29 -0000 1.12 @@ -38,21 +38,21 @@ }; -Etk_Type *etk_container_type_get(void); +Etk_Type *etk_container_type_get(void); -void etk_container_add(Etk_Container *container, Etk_Widget *widget); -void etk_container_remove(Etk_Widget *widget); -void etk_container_remove_all(Etk_Container *container); +void etk_container_add(Etk_Container *container, Etk_Widget *widget); +void etk_container_remove(Etk_Widget *widget); +void etk_container_remove_all(Etk_Container *container); -void etk_container_border_width_set(Etk_Container *container, int border_width); -int etk_container_border_width_get(Etk_Container *container); +void etk_container_border_width_set(Etk_Container *container, int border_width); +int etk_container_border_width_get(Etk_Container *container); Evas_List *etk_container_children_get(Etk_Container *container); Etk_Bool etk_container_is_child(Etk_Container *container, Etk_Widget *widget); void etk_container_for_each(Etk_Container *container, void (*for_each_cb)(Etk_Widget *child)); void etk_container_for_each_data(Etk_Container *container, void (*for_each_cb)(Etk_Widget *child, void *data), void *data); -void etk_container_child_space_fill(Etk_Widget *child, Etk_Geometry *child_space, Etk_Bool hfill, Etk_Bool vfill, float xalign, float yalign); +void etk_container_child_space_fill(Etk_Widget *child, Etk_Geometry *child_space, Etk_Bool hfill, Etk_Bool vfill, float xalign, float yalign); /** @} */ =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_dialog.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- etk_dialog.h 10 Mar 2007 03:18:36 -0000 1.11 +++ etk_dialog.h 2 Apr 2007 09:48:29 -0000 1.12 @@ -61,28 +61,29 @@ Etk_Bool has_separator; }; + Etk_Type *etk_dialog_type_get(void); Etk_Widget *etk_dialog_new(void); -void etk_dialog_pack_in_main_area(Etk_Dialog *dialog, Etk_Widget *widget, Etk_Box_Group group, Etk_Box_Fill_Policy fill_policy, int padding); -void etk_dialog_pack_widget_in_action_area(Etk_Dialog *dialog, Etk_Widget *widget, Etk_Box_Group group, Etk_Box_Fill_Policy fill_policy, int padding); -void etk_dialog_pack_button_in_action_area(Etk_Dialog *dialog, Etk_Button *button, int response_id, Etk_Box_Group group, Etk_Box_Fill_Policy fill_policy, int padding); +void etk_dialog_pack_in_main_area(Etk_Dialog *dialog, Etk_Widget *widget, Etk_Box_Group group, Etk_Box_Fill_Policy fill_policy, int padding); +void etk_dialog_pack_widget_in_action_area(Etk_Dialog *dialog, Etk_Widget *widget, Etk_Box_Group group, Etk_Box_Fill_Policy fill_policy, int padding); +void etk_dialog_pack_button_in_action_area(Etk_Dialog *dialog, Etk_Button *button, int response_id, Etk_Box_Group group, Etk_Box_Fill_Policy fill_policy, int padding); Etk_Widget *etk_dialog_button_add(Etk_Dialog *dialog, const char *label, int response_id); Etk_Widget *etk_dialog_button_add_from_stock(Etk_Dialog *dialog, int stock_id, int response_id); -void etk_dialog_action_area_homogeneous_set(Etk_Dialog *dialog, Etk_Bool homogeneous); -Etk_Bool etk_dialog_action_area_homogeneous_get(Etk_Dialog *dialog); -void etk_dialog_action_area_alignment_set(Etk_Dialog *dialog, float align); -float etk_dialog_action_area_alignment_get(Etk_Dialog *dialog); +void etk_dialog_action_area_homogeneous_set(Etk_Dialog *dialog, Etk_Bool homogeneous); +Etk_Bool etk_dialog_action_area_homogeneous_get(Etk_Dialog *dialog); +void etk_dialog_action_area_alignment_set(Etk_Dialog *dialog, float align); +float etk_dialog_action_area_alignment_get(Etk_Dialog *dialog); Etk_Widget *etk_dialog_main_area_vbox_get(Etk_Dialog *dialog); Etk_Widget *etk_dialog_action_area_hbox_get(Etk_Dialog *dialog); void etk_dialog_button_response_id_set(Etk_Dialog *dialog, Etk_Button *button, int response_id); int etk_dialog_button_response_id_get(Etk_Button *button); -void etk_dialog_has_separator_set(Etk_Dialog *dialog, Etk_Bool has_separator); -Etk_Bool etk_dialog_has_separator_get(Etk_Dialog *dialog); +void etk_dialog_has_separator_set(Etk_Dialog *dialog, Etk_Bool has_separator); +Etk_Bool etk_dialog_has_separator_get(Etk_Dialog *dialog); /** @} */ =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_drag.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- etk_drag.c 8 Mar 2007 18:16:01 -0000 1.11 +++ etk_drag.c 2 Apr 2007 09:48:29 -0000 1.12 @@ -18,7 +18,7 @@ * @brief Gets the type of an Etk_Drag * @return Returns the type on an Etk_Drag */ -Etk_Type *etk_drag_type_get() +Etk_Type *etk_drag_type_get(void) { static Etk_Type *drag_type = NULL; =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_drag.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- etk_drag.h 14 May 2006 21:29:22 -0000 1.3 +++ etk_drag.h 2 Apr 2007 09:48:29 -0000 1.4 @@ -23,7 +23,7 @@ int data_size; }; -Etk_Type *etk_drag_type_get(); +Etk_Type *etk_drag_type_get(void); Etk_Widget *etk_drag_new(Etk_Widget *widget); void etk_drag_types_set(Etk_Drag *drag, const char **types, unsigned int num_types); void etk_drag_data_set(Etk_Drag *drag, void *data, int size); =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_editable.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- etk_editable.h 18 Mar 2007 20:44:47 -0000 1.4 +++ etk_editable.h 2 Apr 2007 09:48:29 -0000 1.5 @@ -28,28 +28,28 @@ Etk_Bool etk_editable_insert(Evas_Object *editable, int pos, const char *text); Etk_Bool etk_editable_delete(Evas_Object *editable, int start, int end); -void etk_editable_cursor_pos_set(Evas_Object *editable, int pos); -int etk_editable_cursor_pos_get(Evas_Object *editable); -void etk_editable_cursor_move_to_start(Evas_Object *editable); -void etk_editable_cursor_move_to_end(Evas_Object *editable); -void etk_editable_cursor_move_left(Evas_Object *editable); -void etk_editable_cursor_move_right(Evas_Object *editable); -void etk_editable_cursor_show(Evas_Object *editable); -void etk_editable_cursor_hide(Evas_Object *editable); +void etk_editable_cursor_pos_set(Evas_Object *editable, int pos); +int etk_editable_cursor_pos_get(Evas_Object *editable); +void etk_editable_cursor_move_to_start(Evas_Object *editable); +void etk_editable_cursor_move_to_end(Evas_Object *editable); +void etk_editable_cursor_move_left(Evas_Object *editable); +void etk_editable_cursor_move_right(Evas_Object *editable); +void etk_editable_cursor_show(Evas_Object *editable); +void etk_editable_cursor_hide(Evas_Object *editable); -void etk_editable_selection_pos_set(Evas_Object *editable, int pos); -int etk_editable_selection_pos_get(Evas_Object *editable); -void etk_editable_selection_move_to_start(Evas_Object *editable); -void etk_editable_selection_move_to_end(Evas_Object *editable); -void etk_editable_selection_move_left(Evas_Object *editable); -void etk_editable_selection_move_right(Evas_Object *editable); -void etk_editable_select_all(Evas_Object *editable); -void etk_editable_unselect_all(Evas_Object *editable); -void etk_editable_selection_show(Evas_Object *editable); -void etk_editable_selection_hide(Evas_Object *editable); +void etk_editable_selection_pos_set(Evas_Object *editable, int pos); +int etk_editable_selection_pos_get(Evas_Object *editable); +void etk_editable_selection_move_to_start(Evas_Object *editable); +void etk_editable_selection_move_to_end(Evas_Object *editable); +void etk_editable_selection_move_left(Evas_Object *editable); +void etk_editable_selection_move_right(Evas_Object *editable); +void etk_editable_select_all(Evas_Object *editable); +void etk_editable_unselect_all(Evas_Object *editable); +void etk_editable_selection_show(Evas_Object *editable); +void etk_editable_selection_hide(Evas_Object *editable); -int etk_editable_pos_get_from_coords(Evas_Object *editable, int x, int y); -void etk_editable_char_size_get(Evas_Object *editable, int *w, int *h); +int etk_editable_pos_get_from_coords(Evas_Object *editable, int x, int y); +void etk_editable_char_size_get(Evas_Object *editable, int *w, int *h); /** @} */ =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_embed.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- etk_embed.h 10 Mar 2007 23:09:32 -0000 1.5 +++ etk_embed.h 2 Apr 2007 09:48:29 -0000 1.6 @@ -45,13 +45,11 @@ }; -Etk_Type *etk_embed_type_get(void); -Etk_Widget *etk_embed_new(Evas *evas); - +Etk_Type *etk_embed_type_get(void); +Etk_Widget *etk_embed_new(Evas *evas); Evas_Object *etk_embed_object_get(Etk_Embed *embed_widget); - -void etk_embed_position_method_set(Etk_Embed *embed, void (*position_get)(void *position_data, int *x, int *y), void *position_data); -void etk_embed_pointer_method_set(Etk_Embed *embed, void (*pointer_set)(void *pointer_data, Etk_Pointer_Type pointer_type), void *pointer_data); +void etk_embed_position_method_set(Etk_Embed *embed, void (*position_get)(void *position_data, int *x, int *y), void *position_data); +void etk_embed_pointer_method_set(Etk_Embed *embed, void (*pointer_set)(void *pointer_data, Etk_Pointer_Type pointer_type), void *pointer_data); /** @} */ =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_engine.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -3 -r1.16 -r1.17 --- etk_engine.c 22 Mar 2007 23:31:40 -0000 1.16 +++ etk_engine.c 2 Apr 2007 09:48:29 -0000 1.17 @@ -40,7 +40,7 @@ * @brief Initializes the engine subsystem * @return Returns ETK_TRUE on success, ETK_FALSE on failure */ -Etk_Bool etk_engine_init() +Etk_Bool etk_engine_init(void) { char *file; Ecore_List *files; @@ -73,7 +73,7 @@ * @internal * @brief Shutdowns the engine subsystem */ -void etk_engine_shutdown() +void etk_engine_shutdown(void) { /* Shutdowns all the loaded engines */ while (_loaded_engines) @@ -109,7 +109,7 @@ * @return Returns the list of the available engines * @warning The returned list should not be modified or freed */ -Evas_List *etk_engine_list_get() +Evas_List *etk_engine_list_get(void) { return _etk_engines; } @@ -139,7 +139,7 @@ * @brief Gets the engine currently used by Etk * @return Returns the engine currently used by Etk or NULL if no engine is loaded yet */ -Etk_Engine *etk_engine_get() +Etk_Engine *etk_engine_get(void) { return _engine; } =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_engine.h,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- etk_engine.h 22 Mar 2007 23:31:40 -0000 1.15 +++ etk_engine.h 2 Apr 2007 09:48:29 -0000 1.16 @@ -14,7 +14,8 @@ * @brief Etk is based on engines that are used for specific tasks such as creating a window or handling copy/paste... * @{ */ - + + /** * @brief The structure of an engine regrouping the different methods to call * @structinfo @@ -85,82 +86,80 @@ void (*selection_text_request)(Etk_Selection_Type selection, Etk_Widget *target); void (*selection_clear)(Etk_Selection_Type selection); - - void (*drag_constructor)(Etk_Drag *drag); void (*drag_begin)(Etk_Drag *drag); }; -Etk_Bool etk_engine_init(); -void etk_engine_shutdown(); -Evas_List *etk_engine_list_get(); -Etk_Bool etk_engine_exists(const char *engine_name); -Etk_Engine *etk_engine_get(); - -Etk_Engine *etk_engine_load(const char *engine_name); -void etk_engine_unload(Etk_Engine *engine); -Etk_Bool etk_engine_inherit_from(Etk_Engine *engine, const char * inherit_name); - -void etk_engine_window_constructor(Etk_Window *window); -void etk_engine_window_destructor(Etk_Window *window); -void etk_engine_window_show(Etk_Window *window); -void etk_engine_window_hide(Etk_Window *window); -Evas *etk_engine_window_evas_get(Etk_Window *window); -void etk_engine_window_title_set(Etk_Window *window, const char *title); -const char *etk_engine_window_title_get(Etk_Window *window); -void etk_engine_window_wmclass_set(Etk_Window *window, const char *window_name, const char *window_class); -void etk_engine_window_move(Etk_Window *window, int x, int y); -void etk_engine_window_resize(Etk_Window *window, int w, int h); -void etk_engine_window_size_min_set(Etk_Window *window, int w, int h); -void etk_engine_window_evas_position_get(Etk_Window *window, int *x, int *y); -void etk_engine_window_screen_position_get(Etk_Window *window, int *x, int *y); -void etk_engine_window_size_get(Etk_Window *window, int *w, int *h); -void etk_engine_window_screen_geometry_get(Etk_Window *window, int *x, int *y, int *w, int *h); -void etk_engine_window_modal_for_window(Etk_Window *window_to_modal, Etk_Window *window); -void etk_engine_window_iconified_set(Etk_Window *window, Etk_Bool iconified); -Etk_Bool etk_engine_window_iconified_get(Etk_Window *window); -void etk_engine_window_maximized_set(Etk_Window *window, Etk_Bool maximized); -Etk_Bool etk_engine_window_maximized_get(Etk_Window *window); -void etk_engine_window_fullscreen_set(Etk_Window *window, Etk_Bool fullscreen); -Etk_Bool etk_engine_window_fullscreen_get(Etk_Window *window); -void etk_engine_window_raise(Etk_Window *window); -void etk_engine_window_lower(Etk_Window *window); -void etk_engine_window_stacking_set(Etk_Window *window, Etk_Window_Stacking stacking); +Etk_Bool etk_engine_init(void); +void etk_engine_shutdown(void); + +Evas_List *etk_engine_list_get(void); +Etk_Bool etk_engine_exists(const char *engine_name); +Etk_Engine *etk_engine_get(void); + +Etk_Engine *etk_engine_load(const char *engine_name); +void etk_engine_unload(Etk_Engine *engine); +Etk_Bool etk_engine_inherit_from(Etk_Engine *engine, const char * inherit_name); + +void etk_engine_window_constructor(Etk_Window *window); +void etk_engine_window_destructor(Etk_Window *window); +void etk_engine_window_show(Etk_Window *window); +void etk_engine_window_hide(Etk_Window *window); +Evas *etk_engine_window_evas_get(Etk_Window *window); +void etk_engine_window_title_set(Etk_Window *window, const char *title); +const char *etk_engine_window_title_get(Etk_Window *window); +void etk_engine_window_wmclass_set(Etk_Window *window, const char *window_name, const char *window_class); +void etk_engine_window_move(Etk_Window *window, int x, int y); +void etk_engine_window_resize(Etk_Window *window, int w, int h); +void etk_engine_window_size_min_set(Etk_Window *window, int w, int h); +void etk_engine_window_evas_position_get(Etk_Window *window, int *x, int *y); +void etk_engine_window_screen_position_get(Etk_Window *window, int *x, int *y); +void etk_engine_window_size_get(Etk_Window *window, int *w, int *h); +void etk_engine_window_screen_geometry_get(Etk_Window *window, int *x, int *y, int *w, int *h); +void etk_engine_window_modal_for_window(Etk_Window *window_to_modal, Etk_Window *window); +void etk_engine_window_iconified_set(Etk_Window *window, Etk_Bool iconified); +Etk_Bool etk_engine_window_iconified_get(Etk_Window *window); +void etk_engine_window_maximized_set(Etk_Window *window, Etk_Bool maximized); +Etk_Bool etk_engine_window_maximized_get(Etk_Window *window); +void etk_engine_window_fullscreen_set(Etk_Window *window, Etk_Bool fullscreen); +Etk_Bool etk_engine_window_fullscreen_get(Etk_Window *window); +void etk_engine_window_raise(Etk_Window *window); +void etk_engine_window_lower(Etk_Window *window); +void etk_engine_window_stacking_set(Etk_Window *window, Etk_Window_Stacking stacking); Etk_Window_Stacking etk_engine_window_stacking_get(Etk_Window *window); -void etk_engine_window_sticky_set(Etk_Window *window, Etk_Bool on); -Etk_Bool etk_engine_window_sticky_get(Etk_Window *window); -void etk_engine_window_focused_set(Etk_Window *window, Etk_Bool focused); -Etk_Bool etk_engine_window_focused_get(Etk_Window *window); -void etk_engine_window_decorated_set(Etk_Window *window, Etk_Bool decorated); -Etk_Bool etk_engine_window_decorated_get(Etk_Window *window); -void etk_engine_window_shaped_set(Etk_Window *window, Etk_Bool shaped); -Etk_Bool etk_engine_window_shaped_get(Etk_Window *window); -void etk_engine_window_has_alpha_set(Etk_Window *window, Etk_Bool has_alpha); -Etk_Bool etk_engine_window_has_alpha_get(Etk_Window *window); -void etk_engine_window_skip_taskbar_hint_set(Etk_Window *window, Etk_Bool skip_taskbar_hint); -Etk_Bool etk_engine_window_skip_taskbar_hint_get(Etk_Window *window); -void etk_engine_window_skip_pager_hint_set(Etk_Window *window, Etk_Bool skip_pager_hint); -Etk_Bool etk_engine_window_skip_pager_hint_get(Etk_Window *window); -void etk_engine_window_pointer_set(Etk_Window *window, Etk_Pointer_Type pointer_type); +void etk_engine_window_sticky_set(Etk_Window *window, Etk_Bool on); +Etk_Bool etk_engine_window_sticky_get(Etk_Window *window); +void etk_engine_window_focused_set(Etk_Window *window, Etk_Bool focused); +Etk_Bool etk_engine_window_focused_get(Etk_Window *window); +void etk_engine_window_decorated_set(Etk_Window *window, Etk_Bool decorated); +Etk_Bool etk_engine_window_decorated_get(Etk_Window *window); +void etk_engine_window_shaped_set(Etk_Window *window, Etk_Bool shaped); +Etk_Bool etk_engine_window_shaped_get(Etk_Window *window); +void etk_engine_window_has_alpha_set(Etk_Window *window, Etk_Bool has_alpha); +Etk_Bool etk_engine_window_has_alpha_get(Etk_Window *window); +void etk_engine_window_skip_taskbar_hint_set(Etk_Window *window, Etk_Bool skip_taskbar_hint); +Etk_Bool etk_engine_window_skip_taskbar_hint_get(Etk_Window *window); +void etk_engine_window_skip_pager_hint_set(Etk_Window *window, Etk_Bool skip_pager_hint); +Etk_Bool etk_engine_window_skip_pager_hint_get(Etk_Window *window); +void etk_engine_window_pointer_set(Etk_Window *window, Etk_Pointer_Type pointer_type); -void etk_engine_popup_window_constructor(Etk_Popup_Window *popup_window); -void etk_engine_popup_window_popup(Etk_Popup_Window *popup_window); -void etk_engine_popup_window_popdown(Etk_Popup_Window *popup_window); +void etk_engine_popup_window_constructor(Etk_Popup_Window *popup_window); +void etk_engine_popup_window_popup(Etk_Popup_Window *popup_window); +void etk_engine_popup_window_popdown(Etk_Popup_Window *popup_window); void etk_engine_event_callback_set(void (*callback)(Etk_Event_Type event, Etk_Event_Global event_info)); unsigned int etk_engine_event_timestamp_get(void); -void etk_engine_mouse_position_get(int *x, int *y); -void etk_engine_mouse_screen_geometry_get(int *x, int *y, int *w, int *h); - -void etk_engine_selection_text_set(Etk_Selection_Type selection, const char *text); -void etk_engine_selection_text_request(Etk_Selection_Type selection, Etk_Widget *target); -void etk_engine_selection_clear(Etk_Selection_Type selection); +void etk_engine_mouse_position_get(int *x, int *y); +void etk_engine_mouse_screen_geometry_get(int *x, int *y, int *w, int *h); +void etk_engine_selection_text_set(Etk_Selection_Type selection, const char *text); +void etk_engine_selection_text_request(Etk_Selection_Type selection, Etk_Widget *target); +void etk_engine_selection_clear(Etk_Selection_Type selection); -void etk_engine_drag_constructor(Etk_Drag *drag); -void etk_engine_drag_begin(Etk_Drag *drag); +void etk_engine_drag_constructor(Etk_Drag *drag); +void etk_engine_drag_begin(Etk_Drag *drag); /** @} */ =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_event.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- etk_event.c 25 Mar 2007 18:22:00 -0000 1.4 +++ etk_event.c 2 Apr 2007 09:48:29 -0000 1.5 @@ -33,7 +33,7 @@ * @internal * @brief Initializes the event subsystem */ -void etk_event_init() +void etk_event_init(void) { int i; @@ -46,7 +46,7 @@ * @internal * @brief Shutdowns the event subsystem */ -void etk_event_shutdown() +void etk_event_shutdown(void) { int i; =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_event.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- etk_event.h 27 Jan 2007 05:14:32 -0000 1.5 +++ etk_event.h 2 Apr 2007 09:48:29 -0000 1.6 @@ -239,8 +239,9 @@ unsigned int timestamp; /**< The timestamp when the event occured */ }; -void etk_event_init(); -void etk_event_shutdown(); + +void etk_event_init(void); +void etk_event_shutdown(void); void etk_event_mouse_in_wrap(Etk_Widget *widget, Evas_Event_Mouse_In *evas_event, Etk_Event_Mouse_In *etk_event); void etk_event_mouse_out_wrap(Etk_Widget *widget, Evas_Event_Mouse_Out *evas_event, Etk_Event_Mouse_Out *etk_event); =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_filechooser_widget.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -3 -r1.19 -r1.20 --- etk_filechooser_widget.c 22 Mar 2007 19:36:51 -0000 1.19 +++ etk_filechooser_widget.c 2 Apr 2007 09:48:29 -0000 1.20 @@ -102,7 +102,7 @@ * @brief Gets the type of an Etk_Filechooser_Widget * @return Returns the type of an Etk_Filechooser_Widget */ -Etk_Type *etk_filechooser_widget_type_get() +Etk_Type *etk_filechooser_widget_type_get(void) { static Etk_Type *filechooser_widget_type = NULL; @@ -127,7 +127,7 @@ * @brief Creates a new file chooser widget * @return Returns the new file chooser widget */ -Etk_Widget *etk_filechooser_widget_new() +Etk_Widget *etk_filechooser_widget_new(void) { return etk_widget_new(ETK_FILECHOOSER_WIDGET_TYPE, NULL); } =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_filechooser_widget.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- etk_filechooser_widget.h 9 Mar 2006 16:36:03 -0000 1.4 +++ etk_filechooser_widget.h 2 Apr 2007 09:48:29 -0000 1.5 @@ -11,11 +11,11 @@ * @{ */ -/** @brief Gets the type of a status bar */ +/** Gets the type of a status bar */ #define ETK_FILECHOOSER_WIDGET_TYPE (etk_filechooser_widget_type_get()) -/** @brief Casts the object to an Etk_Filechooser_Widget */ +/** Casts the object to an Etk_Filechooser_Widget */ #define ETK_FILECHOOSER_WIDGET(obj) (ETK_OBJECT_CAST((obj), ETK_FILECHOOSER_WIDGET_TYPE, Etk_Filechooser_Widget)) -/** @brief Checks if the object is an Etk_Filechooser_Widget */ +/** Checks if the object is an Etk_Filechooser_Widget */ #define ETK_IS_FILECHOOSER_WIDGET(obj) (ETK_OBJECT_CHECK_TYPE((obj), ETK_FILECHOOSER_WIDGET_TYPE)) /** @@ -46,20 +46,20 @@ char *current_folder; }; -Etk_Type *etk_filechooser_widget_type_get(); -Etk_Widget *etk_filechooser_widget_new(); +Etk_Type *etk_filechooser_widget_type_get(void); +Etk_Widget *etk_filechooser_widget_new(void); -void etk_filechooser_widget_select_multiple_set(Etk_Filechooser_Widget *filechooser_widget, Etk_Bool select_multiple); -Etk_Bool etk_filechooser_widget_select_multiple_get(Etk_Filechooser_Widget *filechooser_widget); +void etk_filechooser_widget_select_multiple_set(Etk_Filechooser_Widget *filechooser_widget, Etk_Bool select_multiple); +Etk_Bool etk_filechooser_widget_select_multiple_get(Etk_Filechooser_Widget *filechooser_widget); -void etk_filechooser_widget_show_hidden_set(Etk_Filechooser_Widget *filechooser_widget, Etk_Bool show_hidden); -Etk_Bool etk_filechooser_widget_show_hidden_get(Etk_Filechooser_Widget *filechooser_widget); +void etk_filechooser_widget_show_hidden_set(Etk_Filechooser_Widget *filechooser_widget, Etk_Bool show_hidden); +Etk_Bool etk_filechooser_widget_show_hidden_get(Etk_Filechooser_Widget *filechooser_widget); -void etk_filechooser_widget_current_folder_set(Etk_Filechooser_Widget *filechooser_widget, const char *folder); +void etk_filechooser_widget_current_folder_set(Etk_Filechooser_Widget *filechooser_widget, const char *folder); const char *etk_filechooser_widget_current_folder_get(Etk_Filechooser_Widget *filechooser_widget); const char *etk_filechooser_widget_selected_file_get(Etk_Filechooser_Widget *widget); -Evas_List *etk_filechooser_widget_selected_files_get(Etk_Filechooser_Widget *widget); +Evas_List *etk_filechooser_widget_selected_files_get(Etk_Filechooser_Widget *widget); /** @} */ =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_fixed.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- etk_fixed.h 9 Dec 2006 09:56:33 -0000 1.1 +++ etk_fixed.h 2 Apr 2007 09:48:29 -0000 1.2 @@ -36,9 +36,9 @@ Etk_Type *etk_fixed_type_get(void); Etk_Widget *etk_fixed_new(void); -void etk_fixed_put(Etk_Fixed *fixed, Etk_Widget *widget, int x, int y); -void etk_fixed_move(Etk_Fixed *fixed, Etk_Widget *widget, int x, int y); -void etk_fixed_child_position_get(Etk_Fixed *fixed, Etk_Widget *widget, int *x, int *y); +void etk_fixed_put(Etk_Fixed *fixed, Etk_Widget *widget, int x, int y); +void etk_fixed_move(Etk_Fixed *fixed, Etk_Widget *widget, int x, int y); +void etk_fixed_child_position_get(Etk_Fixed *fixed, Etk_Widget *widget, int *x, int *y); /** @} */ =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_iconbox.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -3 -r1.22 -r1.23 --- etk_iconbox.c 25 Mar 2007 18:22:00 -0000 1.22 +++ etk_iconbox.c 2 Apr 2007 09:48:29 -0000 1.23 @@ -111,7 +111,7 @@ * @brief Gets the type of an Etk_Iconbox * @return Returns the type of an Etk_Iconbox */ -Etk_Type *etk_iconbox_type_get() +Etk_Type *etk_iconbox_type_get(void) { static Etk_Type *iconbox_type = NULL; @@ -137,7 +137,7 @@ * @brief Creates a new iconbox * @return Returns the new iconbox widget */ -Etk_Widget *etk_iconbox_new() +Etk_Widget *etk_iconbox_new(void) { return etk_widget_new(ETK_ICONBOX_TYPE, "theme-group", "iconbox", "focusable", ETK_TRUE, "focus-on-click", ETK_TRUE, NULL); =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_iconbox.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- etk_iconbox.h 6 Oct 2006 17:04:14 -0000 1.9 +++ etk_iconbox.h 2 Apr 2007 09:48:29 -0000 1.10 @@ -31,6 +31,7 @@ /** Check if the object is an Etk_Iconbobx */ #define ETK_IS_ICONBOX(obj) (ETK_OBJECT_CHECK_TYPE((obj), ETK_ICONBOX_TYPE)) + /** * @brief Describes the model of an iconbox: it includes the position and the size of the cell, of the icon and * of the label. An iconbox can have several models, and, at any moment, you can change the current model to @@ -109,43 +110,44 @@ Etk_Bool frozen; }; -Etk_Type *etk_iconbox_type_get(); -Etk_Widget *etk_iconbox_new(); + +Etk_Type *etk_iconbox_type_get(void); +Etk_Widget *etk_iconbox_new(void); Etk_Iconbox_Model *etk_iconbox_model_new(Etk_Iconbox *iconbox); void etk_iconbox_model_free(Etk_Iconbox_Model *model); void etk_iconbox_current_model_set(Etk_Iconbox *iconbox, Etk_Iconbox_Model *model); Etk_Iconbox_Model *etk_iconbox_current_model_get(Etk_Iconbox *iconbox); -void etk_iconbox_model_geometry_set(Etk_Iconbox_Model *model, int width, int height, int xpadding, int ypadding); -void etk_iconbox_model_geometry_get(Etk_Iconbox_Model *model, int *width, int *height, int *xpadding, int *ypadding); -void etk_iconbox_model_icon_geometry_set(Etk_Iconbox_Model *model, int x, int y, int width, int height, Etk_Bool fill, Etk_Bool keep_aspect_ratio); -void etk_iconbox_model_icon_geometry_get(Etk_Iconbox_Model *model, int *x, int *y, int *width, int *height, Etk_Bool *fill, Etk_Bool *keep_aspect_ratio); -void etk_iconbox_model_label_geometry_set(Etk_Iconbox_Model *model, int x, int y, int width, int height, float xalign, float yalign); -void etk_iconbox_model_label_geometry_get(Etk_Iconbox_Model *model, int *x, int *y, int *width, int *height, float *xalign, float *yalign); - -void etk_iconbox_freeze(Etk_Iconbox *iconbox); -void etk_iconbox_thaw(Etk_Iconbox *iconbox); - -Etk_Iconbox_Icon *etk_iconbox_append(Etk_Iconbox *iconbox, const char *filename, const char *edje_group, const char *label); -void etk_iconbox_icon_del(Etk_Iconbox_Icon *icon); -void etk_iconbox_clear(Etk_Iconbox *iconbox); -Etk_Iconbox_Icon *etk_iconbox_icon_get_at_xy(Etk_Iconbox *iconbox, int x, int y, Etk_Bool over_cell, Etk_Bool over_icon, Etk_Bool over_label); - -void etk_iconbox_icon_file_set(Etk_Iconbox_Icon *icon, const char *filename, const char *edje_group); -void etk_iconbox_icon_file_get(Etk_Iconbox_Icon *icon, const char **filename, const char **edje_group); -void etk_iconbox_icon_label_set(Etk_Iconbox_Icon *icon, const char *label); -const char *etk_iconbox_icon_label_get(Etk_Iconbox_Icon *icon); - -void etk_iconbox_icon_data_set(Etk_Iconbox_Icon *icon, void *data); -void etk_iconbox_icon_data_set_full(Etk_Iconbox_Icon *icon, void *data, void (*free_cb)(void *data)); -void *etk_iconbox_icon_data_get(Etk_Iconbox_Icon *icon); - -void etk_iconbox_select_all(Etk_Iconbox *iconbox); -void etk_iconbox_unselect_all(Etk_Iconbox *iconbox); -void etk_iconbox_icon_select(Etk_Iconbox_Icon *icon); -void etk_iconbox_icon_unselect(Etk_Iconbox_Icon *icon); -Etk_Bool etk_iconbox_is_selected(Etk_Iconbox_Icon *icon); +void etk_iconbox_model_geometry_set(Etk_Iconbox_Model *model, int width, int height, int xpadding, int ypadding); +void etk_iconbox_model_geometry_get(Etk_Iconbox_Model *model, int *width, int *height, int *xpadding, int *ypadding); +void etk_iconbox_model_icon_geometry_set(Etk_Iconbox_Model *model, int x, int y, int width, int height, Etk_Bool fill, Etk_Bool keep_aspect_ratio); +void etk_iconbox_model_icon_geometry_get(Etk_Iconbox_Model *model, int *x, int *y, int *width, int *height, Etk_Bool *fill, Etk_Bool *keep_aspect_ratio); +void etk_iconbox_model_label_geometry_set(Etk_Iconbox_Model *model, int x, int y, int width, int height, float xalign, float yalign); +void etk_iconbox_model_label_geometry_get(Etk_Iconbox_Model *model, int *x, int *y, int *width, int *height, float *xalign, float *yalign); + +void etk_iconbox_freeze(Etk_Iconbox *iconbox); +void etk_iconbox_thaw(Etk_Iconbox *iconbox); + +Etk_Iconbox_Icon *etk_iconbox_append(Etk_Iconbox *iconbox, const char *filename, const char *edje_group, const char *label); +void etk_iconbox_icon_del(Etk_Iconbox_Icon *icon); +void etk_iconbox_clear(Etk_Iconbox *iconbox); +Etk_Iconbox_Icon *etk_iconbox_icon_get_at_xy(Etk_Iconbox *iconbox, int x, int y, Etk_Bool over_cell, Etk_Bool over_icon, Etk_Bool over_label); + +void etk_iconbox_icon_file_set(Etk_Iconbox_Icon *icon, const char *filename, const char *edje_group); +void etk_iconbox_icon_file_get(Etk_Iconbox_Icon *icon, const char **filename, const char **edje_group); +void etk_iconbox_icon_label_set(Etk_Iconbox_Icon *icon, const char *label); +const char *etk_iconbox_icon_label_get(Etk_Iconbox_Icon *icon); + +void etk_iconbox_icon_data_set(Etk_Iconbox_Icon *icon, void *data); +void etk_iconbox_icon_data_set_full(Etk_Iconbox_Icon *icon, void *data, void (*free_cb)(void *data)); +void *etk_iconbox_icon_data_get(Etk_Iconbox_Icon *icon); + +void etk_iconbox_select_all(Etk_Iconbox *iconbox); +void etk_iconbox_unselect_all(Etk_Iconbox *iconbox); +void etk_iconbox_icon_select(Etk_Iconbox_Icon *icon); +void etk_iconbox_icon_unselect(Etk_Iconbox_Icon *icon); +Etk_Bool etk_iconbox_is_selected(Etk_Iconbox_Icon *icon); Etk_Scrolled_View *etk_iconbox_scrolled_view_get(Etk_Iconbox *iconbox); =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_image.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- etk_image.h 29 Dec 2006 22:10:13 -0000 1.13 +++ etk_image.h 2 Apr 2007 09:48:29 -0000 1.14 @@ -19,6 +19,7 @@ /** Check if the object is an Etk_Image */ #define ETK_IS_IMAGE(obj) (ETK_OBJECT_CHECK_TYPE((obj), ETK_IMAGE_TYPE)) + /** @brief The different sources that an Etk_Image can use */ typedef enum Etk_Image_Source { @@ -29,6 +30,7 @@ ETK_IMAGE_DATA /**< The image uses pixel data given by the user */ } Etk_Image_Source; + /** * @brief @widget A widget that can load and display an image * @structinfo @@ -74,14 +76,14 @@ Etk_Bool keep_aspect; }; -Etk_Type *etk_image_type_get(void); -Etk_Widget *etk_image_new(void); -Etk_Widget *etk_image_new_from_file(const char *filename, const char *key); -Etk_Widget *etk_image_new_from_edje(const char *filename, const char *group); -Etk_Widget *etk_image_new_from_stock(Etk_Stock_Id stock_id, Etk_Stock_Size stock_size); -Etk_Widget *etk_image_new_from_evas_object(Evas_Object *evas_object); -Etk_Widget *etk_image_new_from_data(int width, int height, void *data, Etk_Bool copy); +Etk_Type *etk_image_type_get(void); +Etk_Widget *etk_image_new(void); +Etk_Widget *etk_image_new_from_file(const char *filename, const char *key); +Etk_Widget *etk_image_new_from_edje(const char *filename, const char *group); +Etk_Widget *etk_image_new_from_stock(Etk_Stock_Id stock_id, Etk_Stock_Size stock_size); +Etk_Widget *etk_image_new_from_evas_object(Evas_Object *evas_object); +Etk_Widget *etk_image_new_from_data(int width, int height, void *data, Etk_Bool copy); void etk_image_set_from_file(Etk_Image *image, const char *filename, const char *key); void etk_image_file_get(Etk_Image *image, char **filename, char **key); @@ -93,18 +95,17 @@ Evas_Object *etk_image_evas_object_get(Etk_Image *image); void etk_image_set_from_data(Etk_Image *image, int width, int height, void *data, Etk_Bool copy); void *etk_image_data_get(Etk_Image *image, Etk_Bool for_writing); - Etk_Image_Source etk_image_source_get(Etk_Image *image); -void etk_image_update(Etk_Image *image); -void etk_image_update_rect(Etk_Image *image, int x, int y, int w, int h); -void etk_image_copy(Etk_Image *dest_image, Etk_Image *src_image); - -void etk_image_size_get(Etk_Image *image, int *width, int *height); -void etk_image_keep_aspect_set(Etk_Image *image, Etk_Bool keep_aspect); -Etk_Bool etk_image_keep_aspect_get(Etk_Image *image); -void etk_image_aspect_ratio_set(Etk_Image *image, double aspect_ratio); -double etk_image_aspect_ratio_get(Etk_Image *image); +void etk_image_update(Etk_Image *image); +void etk_image_update_rect(Etk_Image *image, int x, int y, int w, int h); +void etk_image_copy(Etk_Image *dest_image, Etk_Image *src_image); + +void etk_image_size_get(Etk_Image *image, int *width, int *height); +void etk_image_keep_aspect_set(Etk_Image *image, Etk_Bool keep_aspect); +Etk_Bool etk_image_keep_aspect_get(Etk_Image *image); +void etk_image_aspect_ratio_set(Etk_Image *image, double aspect_ratio); +double etk_image_aspect_ratio_get(Etk_Image *image); /** @} */ =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_label.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -3 -r1.30 -r1.31 --- etk_label.c 1 Apr 2007 19:09:31 -0000 1.30 +++ etk_label.c 2 Apr 2007 09:48:29 -0000 1.31 @@ -38,7 +38,7 @@ * @brief Gets the type of an Etk_Label * @return Returns the type of an Etk_Label */ -Etk_Type *etk_label_type_get() +Etk_Type *etk_label_type_get(void) { static Etk_Type *label_type = NULL; =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_label.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- etk_label.h 28 Jan 2007 18:39:07 -0000 1.5 +++ etk_label.h 2 Apr 2007 09:48:29 -0000 1.6 @@ -5,13 +5,6 @@ #include <Evas.h> #include "etk_widget.h" -/* - * TODO/FIXME list: - * - Fix bad size_request (evas_textblock bug?): (does this bug still exist?) - * - Add more style tags - * - Make labels themeable - */ - /** * @defgroup Etk_Label Etk_Label * @brief The Etk_Label widget is a simple widget that can display text @@ -25,6 +18,7 @@ /** Check if the object is an Etk_Label */ #define ETK_IS_LABEL(obj) (ETK_OBJECT_CHECK_TYPE((obj), ETK_LABEL_TYPE)) + /** * @brief @widget A simple widget that can display text * @structinfo @@ -41,14 +35,14 @@ float yalign; }; -Etk_Type *etk_label_type_get(); + +Etk_Type *etk_label_type_get(void); Etk_Widget *etk_label_new(const char *text); void etk_label_set(Etk_Label *label, const char *text); const char *etk_label_get(Etk_Label *label); - -void etk_label_alignment_set(Etk_Label *label, float xalign, float yalign); -void etk_label_alignment_get(Etk_Label *label, float *xalign, float *yalign); +void etk_label_alignment_set(Etk_Label *label, float xalign, float yalign); +void etk_label_alignment_get(Etk_Label *label, float *xalign, float *yalign); /** @} */ =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_main.c,v retrieving revision 1.37 retrieving revision 1.38 diff -u -3 -r1.37 -r1.38 --- etk_main.c 22 Mar 2007 19:36:51 -0000 1.37 +++ etk_main.c 2 Apr 2007 09:48:29 -0000 1.38 @@ -130,7 +130,7 @@ * @return Returns the new value of the init-counter. If 0 is returned, it means that the resources has effectively * been freed. */ -int etk_shutdown() +int etk_shutdown(void) { if (_etk_main_init_count <= 0) return 0; @@ -166,7 +166,7 @@ * @note It calls ecore_main_loop_begin() so you should not call ecore_main_loop_begin() or ecore_main_loop_quit() * if you are using etk_main() in your program. */ -void etk_main() +void etk_main(void) { if (_etk_main_init_count <= 0 || _etk_main_running) return; @@ -179,7 +179,7 @@ * @brief Leaves the main loop of Etk. It will quit the main loop of Ecore (ecore_main_loop_quit()) * and will make etk_main() return. */ -void etk_main_quit() +void etk_main_quit(void) { if (!_etk_main_running) return; @@ -192,7 +192,7 @@ * @brief Runs an iteration of the main loop: it updates the widgets that need to be updated * @note You usually do not need to call it manually, you might want to use etk_main() instead */ -void etk_main_iterate() +void etk_main_iterate(void) { Evas_List *l; Etk_Toplevel *toplevel; =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_main.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- etk_main.h 6 Oct 2006 17:04:14 -0000 1.8 +++ etk_main.h 2 Apr 2007 09:48:29 -0000 1.9 @@ -11,12 +11,12 @@ * @{ */ -int etk_init(int *argc, char ***argv); -int etk_shutdown(); +int etk_init(int *argc, char ***argv); +int etk_shutdown(void); -void etk_main(); -void etk_main_quit(); -void etk_main_iterate(); +void etk_main(void); +void etk_main_quit(void); +void etk_main_iterate(void); /** @} */ =================================================================== RCS file: /cvs/e/e17/libs/etk/src/lib/etk_menu.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -3 -r1.25 -r1.26 --- etk_menu.c 1 Apr 2007 19:09:31 -0000 1.25 +++ etk_menu.c 2 Apr 2007 09:48:29 -0000 1.26 @@ -56,7 +56,7 @@ * @brief Gets the type of an Etk_Menu * @return Returns the type of an Etk_Menu */ -Etk_Type *etk_menu_type_get() +Etk_Type *etk_menu_type_get(void) { static Etk_Type *menu_type = NULL; @@ -84,7 +84,7 @@ * @brief Creates a new menu * @return Returns the new menu widget */ -Etk_Widget *etk_menu_new() +Etk_Widget *etk_menu_new(void) { return etk_widget_new(ETK_... [truncated message content] |