From bcfcebf24b40c8c2ecd9080d51189264d2c5bb66 Mon Sep 17 00:00:00 2001 From: jypark Date: Sun, 26 Feb 2012 13:16:36 +0000 Subject: [PATCH] remove some code related with elm_fileselector deprecated function git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@68453 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/elc_fileselector_button.c | 32 ---------- src/lib/elc_fileselector_entry.c | 30 --------- src/lib/elm_deprecated.h | 126 -------------------------------------- 3 files changed, 188 deletions(-) diff --git a/src/lib/elc_fileselector_button.c b/src/lib/elc_fileselector_button.c index 702f115..452498d 100644 --- a/src/lib/elc_fileselector_button.c +++ b/src/lib/elc_fileselector_button.c @@ -349,18 +349,6 @@ elm_fileselector_button_add(Evas_Object *parent) return obj; } -EAPI void -elm_fileselector_button_label_set(Evas_Object *obj, - const char *label) -{ - _elm_fileselector_button_label_set(obj, NULL, label); -} - -EAPI const char * -elm_fileselector_button_label_get(const Evas_Object *obj) -{ - return _elm_fileselector_button_label_get(obj, NULL); -} EAPI void elm_fileselector_button_window_title_set(Evas_Object *obj, @@ -530,23 +518,3 @@ elm_fileselector_button_inwin_mode_get(const Evas_Object *obj) if (!wd) return EINA_FALSE; return wd->inwin_mode; } - -EAPI void -elm_fileselector_button_icon_set(Evas_Object *obj, - Evas_Object *icon) -{ - _content_set_hook(obj, NULL, icon); -} - -EAPI Evas_Object * -elm_fileselector_button_icon_get(const Evas_Object *obj) -{ - return _content_get_hook(obj, NULL); -} - -EAPI Evas_Object * -elm_fileselector_button_icon_unset(Evas_Object *obj) -{ - return _content_unset_hook(obj, NULL); -} - diff --git a/src/lib/elc_fileselector_entry.c b/src/lib/elc_fileselector_entry.c index b37c19e..8fbfce0 100644 --- a/src/lib/elc_fileselector_entry.c +++ b/src/lib/elc_fileselector_entry.c @@ -346,18 +346,6 @@ elm_fileselector_entry_add(Evas_Object *parent) } EAPI void -elm_fileselector_entry_button_label_set(Evas_Object *obj, const char *label) -{ - _elm_fileselector_entry_button_label_set(obj, NULL, label); -} - -EAPI const char * -elm_fileselector_entry_button_label_get(const Evas_Object *obj) -{ - return _elm_fileselector_entry_button_label_get(obj, NULL); -} - -EAPI void elm_fileselector_entry_selected_set(Evas_Object *obj, const char *path) { ELM_CHECK_WIDTYPE(obj, widtype); @@ -501,21 +489,3 @@ elm_fileselector_entry_inwin_mode_get(const Evas_Object *obj) if (!wd) return EINA_FALSE; return elm_fileselector_button_inwin_mode_get(wd->button); } - -EAPI void -elm_fileselector_entry_button_icon_set(Evas_Object *obj, Evas_Object *icon) -{ - _content_set_hook(obj, NULL, icon); -} - -EAPI Evas_Object * -elm_fileselector_entry_button_icon_get(const Evas_Object *obj) -{ - return _content_get_hook(obj, NULL); -} - -EAPI Evas_Object * -elm_fileselector_entry_button_icon_unset(Evas_Object *obj) -{ - return _content_unset_hook(obj, NULL); -} diff --git a/src/lib/elm_deprecated.h b/src/lib/elm_deprecated.h index 1bd00ae..01c1902 100644 --- a/src/lib/elm_deprecated.h +++ b/src/lib/elm_deprecated.h @@ -226,132 +226,6 @@ EINA_DEPRECATED EAPI void elm_scrolled_entry_cnp_textonly_set(Evas_Objec EINA_DEPRECATED EAPI Eina_Bool elm_scrolled_entry_cnp_textonly_get(Evas_Object *obj); /** - * Set the label for a given file selector button widget - * - * @param obj The file selector button widget - * @param label The text label to be displayed on @p obj - * - * @deprecated use elm_object_text_set() instead. - */ -EINA_DEPRECATED EAPI void elm_fileselector_button_label_set(Evas_Object *obj, const char *label); - -/** - * Get the label set for a given file selector button widget - * - * @param obj The file selector button widget - * @return The button label - * - * @deprecated use elm_object_text_set() instead. - */ -EINA_DEPRECATED EAPI const char *elm_fileselector_button_label_get(const Evas_Object *obj); - -/** - * Set the icon on a given file selector button widget - * - * @param obj The file selector button widget - * @param icon The icon object for the button - * - * Once the icon object is set, a previously set one will be - * deleted. If you want to keep the latter, use the - * elm_fileselector_button_icon_unset() function. - * - * @deprecated Use elm_object_part_content_set() instead - * @see elm_fileselector_button_icon_get() - */ -EINA_DEPRECATED EAPI void elm_fileselector_button_icon_set(Evas_Object *obj, Evas_Object *icon); - -/** - * Get the icon set for a given file selector button widget - * - * @param obj The file selector button widget - * @return The icon object currently set on @p obj or @c NULL, if - * none is - * - * @deprecated Use elm_object_part_content_get() instead - * @see elm_fileselector_button_icon_set() - */ -EINA_DEPRECATED EAPI Evas_Object *elm_fileselector_button_icon_get(const Evas_Object *obj); - -/** - * Unset the icon used in a given file selector button widget - * - * @param obj The file selector button widget - * @return The icon object that was being used on @p obj or @c - * NULL, on errors - * - * Unparent and return the icon object which was set for this - * widget. - * - * @deprecated Use elm_object_part_content_unset() instead - * @see elm_fileselector_button_icon_set() - */ -EINA_DEPRECATED EAPI Evas_Object *elm_fileselector_button_icon_unset(Evas_Object *obj); - -/** - * Set the label for a given file selector entry widget's button - * - * @param obj The file selector entry widget - * @param label The text label to be displayed on @p obj widget's - * button - * - * @deprecated use elm_object_text_set() instead. - */ -EINA_DEPRECATED EAPI void elm_fileselector_entry_button_label_set(Evas_Object *obj, const char *label); - -/** - * Get the label set for a given file selector entry widget's button - * - * @param obj The file selector entry widget - * @return The widget button's label - * - * @deprecated use elm_object_text_set() instead. - */ -EINA_DEPRECATED EAPI const char *elm_fileselector_entry_button_label_get(const Evas_Object *obj); - -/** - * Set the icon on a given file selector entry widget's button - * - * @param obj The file selector entry widget - * @param icon The icon object for the entry's button - * - * Once the icon object is set, a previously set one will be - * deleted. If you want to keep the latter, use the - * elm_fileselector_entry_button_icon_unset() function. - * - * @deprecated Use elm_object_part_content_set() instead - * @see elm_fileselector_entry_button_icon_get() - */ -EINA_DEPRECATED EAPI void elm_fileselector_entry_button_icon_set(Evas_Object *obj, Evas_Object *icon); - -/** - * Get the icon set for a given file selector entry widget's button - * - * @param obj The file selector entry widget - * @return The icon object currently set on @p obj widget's button - * or @c NULL, if none is - * - * @deprecated Use elm_object_part_content_get() instead - * @see elm_fileselector_entry_button_icon_set() - */ -EINA_DEPRECATED EAPI Evas_Object *elm_fileselector_entry_button_icon_get(const Evas_Object *obj); - -/** - * Unset the icon used in a given file selector entry widget's - * button - * - * @param obj The file selector entry widget - * @return The icon object that was being used on @p obj widget's - * button or @c NULL, on errors - * - * Unparent and return the icon object which was set for this - * widget's button. - * - * @deprecated Use elm_object_part_content_unset() instead - * @see elm_fileselector_entry_button_icon_set() - */ -EINA_DEPRECATED EAPI Evas_Object *elm_fileselector_entry_button_icon_unset(Evas_Object *obj); - -/** * @brief Sets the content of the hover object and the direction in which it * will pop out. * -- 2.7.4