From e626d6ecb2f4b04da332a99ec27f0b3c28270a65 Mon Sep 17 00:00:00 2001 From: WooHyun Jung Date: Thu, 8 Mar 2012 16:47:03 +0900 Subject: [PATCH] [Entry] elm_entry.h merge finished --- src/lib/elm_entry.h | 325 ---------------------------------------------------- 1 file changed, 325 deletions(-) diff --git a/src/lib/elm_entry.h b/src/lib/elm_entry.h index 8f43438..311d2bd 100644 --- a/src/lib/elm_entry.h +++ b/src/lib/elm_entry.h @@ -1,80 +1,3 @@ -<<<<<<< HEAD -typedef enum -{ - ELM_TEXT_FORMAT_PLAIN_UTF8, - ELM_TEXT_FORMAT_MARKUP_UTF8 -} Elm_Text_Format; - -/** - * Line wrapping types. - */ -typedef enum -{ - ELM_WRAP_NONE = 0, /**< No wrap - value is zero */ - ELM_WRAP_CHAR, /**< Char wrap - wrap between characters */ - ELM_WRAP_WORD, /**< Word wrap - wrap in allowed wrapping points (as defined in the unicode standard) */ - ELM_WRAP_MIXED, /**< Mixed wrap - Word wrap, and if that fails, char wrap. */ - ELM_WRAP_LAST -} Elm_Wrap_Type; /**< Type of word or character wrapping to use */ - -typedef enum -{ - ELM_INPUT_PANEL_LAYOUT_NORMAL, /**< Default layout */ - ELM_INPUT_PANEL_LAYOUT_NUMBER, /**< Number layout */ - ELM_INPUT_PANEL_LAYOUT_EMAIL, /**< Email layout */ - ELM_INPUT_PANEL_LAYOUT_URL, /**< URL layout */ - ELM_INPUT_PANEL_LAYOUT_PHONENUMBER, /**< Phone Number layout */ - ELM_INPUT_PANEL_LAYOUT_IP, /**< IP layout */ - ELM_INPUT_PANEL_LAYOUT_MONTH, /**< Month layout */ - ELM_INPUT_PANEL_LAYOUT_NUMBERONLY, /**< Number Only layout */ - ELM_INPUT_PANEL_LAYOUT_INVALID, /**< Never use this */ - ELM_INPUT_PANEL_LAYOUT_HEX, /**< Hexadecimal layout */ - ELM_INPUT_PANEL_LAYOUT_TERMINAL, /**< Command-line terminal layout */ - ELM_INPUT_PANEL_LAYOUT_PASSWORD /**< Like normal, but no auto-correct, no auto-capitalization etc. */ -} Elm_Input_Panel_Layout; /**< Type of input panel (virtual keyboard) to use - this is a hint and may not provide exactly what is desired. */ - -typedef enum -{ - ELM_INPUT_PANEL_LANG_AUTOMATIC, /**< Automatic */ - ELM_INPUT_PANEL_LANG_ALPHABET /**< Alphabet */ -} Elm_Input_Panel_Lang; - -typedef enum -{ - ELM_AUTOCAPITAL_TYPE_NONE, /**< No auto-capitalization when typing */ - ELM_AUTOCAPITAL_TYPE_WORD, /**< Autocapitalize each word typed */ - ELM_AUTOCAPITAL_TYPE_SENTENCE, /**< Autocapitalize the start of each sentence */ - ELM_AUTOCAPITAL_TYPE_ALLCHARACTER, /**< Autocapitalize all letters */ -} Elm_Autocapital_Type; /**< Choose method of auto-capitalization */ - -typedef enum -{ - ELM_INPUT_PANEL_RETURN_KEY_TYPE_DEFAULT, - ELM_INPUT_PANEL_RETURN_KEY_TYPE_DONE, - ELM_INPUT_PANEL_RETURN_KEY_TYPE_GO, - ELM_INPUT_PANEL_RETURN_KEY_TYPE_JOIN, - ELM_INPUT_PANEL_RETURN_KEY_TYPE_LOGIN, - ELM_INPUT_PANEL_RETURN_KEY_TYPE_NEXT, - ELM_INPUT_PANEL_RETURN_KEY_TYPE_SEARCH, - ELM_INPUT_PANEL_RETURN_KEY_TYPE_SEND -} Elm_Input_Panel_Return_Key_Type; - -/** - * @enum _Elm_CNP_Mode - * @typedef Elm_CNP_Mode - * Enum of entry's copy & paste policy. - * - * @see elm_entry_cnp_mode_set() - * @see elm_entry_cnp_mode_get() - */ - typedef enum _Elm_CNP_Mode { - ELM_CNP_MODE_MARKUP = 0, /**< copy & paste text with markup tag */ - ELM_CNP_MODE_NO_IMAGE = 1, /**< copy & paste text without item(image) tag */ - ELM_CNP_MODE_PLAINTEXT = 2 /**< copy & paste text without markup tag */ - } Elm_CNP_Mode; - -======= ->>>>>>> remotes/origin/upstream /** * @defgroup Entry Entry * @@ -89,26 +12,15 @@ typedef enum * * An entry is a convenience widget which shows a box that the user can * enter text into. Entries by default don't scroll, so they grow to -<<<<<<< HEAD - * accomodate the entire text, resizing the parent window as needed. This -======= * accommodate the entire text, resizing the parent window as needed. This ->>>>>>> remotes/origin/upstream * can be changed with the elm_entry_scrollable_set() function. * * They can also be single line or multi line (the default) and when set * to multi line mode they support text wrapping in any of the modes -<<<<<<< HEAD - * indicated by Elm_Wrap_Type. - * - * Other features include password mode, filtering of inserted text with - * elm_entry_text_filter_append() and related functions, inline "items" and -======= * indicated by #Elm_Wrap_Type. * * Other features include password mode, filtering of inserted text with * elm_entry_markup_filter_append() and related functions, inline "items" and ->>>>>>> remotes/origin/upstream * formatted markup text. * * @section entry-markup Formatted text @@ -125,20 +37,12 @@ typedef enum * enclosed text. * @li \...\: Sets the @b bold style for the enclosed text. * @li \...\: Underlines the enclosed text. -<<<<<<< HEAD - * @li \...\: Hilights the enclosed text. -======= * @li \...\: Highlights the enclosed text. ->>>>>>> remotes/origin/upstream * * @section entry-special Special markups * * Besides those used to format text, entries support two special markup -<<<<<<< HEAD - * tags used to insert clickable portions of text or items inlined within -======= * tags used to insert click-able portions of text or items inlined within ->>>>>>> remotes/origin/upstream * the text. * * @subsection entry-anchors Anchors @@ -183,11 +87,7 @@ typedef enum * @li relsize: Size is adjusted for the item to fit within the current * line height. * -<<<<<<< HEAD - * Besides their size, items are specificed a @c vsize value that affects -======= * Besides their size, items are specified a @c vsize value that affects ->>>>>>> remotes/origin/upstream * how their final size and position are calculated. The possible values * are: * @li ascent: Item will be placed within the line's baseline and its @@ -269,11 +169,7 @@ typedef enum * * @section entry-files Loading and saving files * -<<<<<<< HEAD - * Entries have convinience functions to load text from a file and save -======= * Entries have convenience functions to load text from a file and save ->>>>>>> remotes/origin/upstream * changes back to it after a short delay. The automatic saving is enabled * by default, but can be disabled with elm_entry_autosave_set() and files * can be loaded directly as plain text or have any markup in them @@ -317,11 +213,7 @@ typedef enum * @li "preedit,changed": The preedit string has changed. * @li "language,changed": Program language changed. * -<<<<<<< HEAD - * Default contents parts of the entry items that you can use for are: -======= * Default content parts of the entry items that you can use for are: ->>>>>>> remotes/origin/upstream * @li "icon" - An icon in the entry * @li "end" - A content in the end of the entry * @@ -348,8 +240,6 @@ typedef enum */ /** -<<<<<<< HEAD -======= * @enum _Elm_Text_Format * @typedef Elm_Text_Format * @@ -455,7 +345,6 @@ typedef enum } Elm_Input_Panel_Return_Key_Type; /** ->>>>>>> remotes/origin/upstream * @typedef Elm_Entry_Anchor_Info * * The info sent in the callback for the "anchor,clicked" signals emitted @@ -480,8 +369,6 @@ struct _Elm_Entry_Anchor_Info }; /** -<<<<<<< HEAD -======= * @typedef Elm_Entry_Anchor_Hover_Info * * The info sent in the callback for "anchor,clicked" signals emitted by @@ -542,22 +429,14 @@ struct _Elm_Entry_Anchor_Hover_Info typedef Evas_Object * (*Elm_Entry_Item_Provider_Cb)(void *data, Evas_Object * entry, const char *item); /** ->>>>>>> remotes/origin/upstream * @typedef Elm_Entry_Filter_Cb * This callback type is used by entry filters to modify text. * @param data The data specified as the last param when adding the filter * @param entry The entry object -<<<<<<< HEAD - * @param text A pointer to the location of the text being filtered. This data can be modified, - * but any additional allocations must be managed by the user. - * @see elm_entry_text_filter_append - * @see elm_entry_text_filter_prepend -======= * @param text A pointer to the location of the text being filtered. The type of text is always markup. This data can be modified, but any additional allocations must be managed by the user. * @see elm_entry_markup_filter_append * @see elm_entry_markup_filter_prepend * @see elm_entry_markup_filter_remove ->>>>>>> remotes/origin/upstream */ typedef void (*Elm_Entry_Filter_Cb)(void *data, Evas_Object *entry, char **text); @@ -662,11 +541,7 @@ EAPI const char *elm_entry_entry_get(const Evas_Object *obj); * @param obj The entry object * @param entry The text to be displayed * -<<<<<<< HEAD - * @see elm_entry_text_filter_append() -======= * @see elm_entry_markup_filter_append() ->>>>>>> remotes/origin/upstream */ EAPI void elm_entry_entry_append(Evas_Object *obj, const char *entry); @@ -755,11 +630,7 @@ EAPI void elm_entry_calc_force(Evas_Object *obj); * @param obj The entry object * @param entry The text to insert * -<<<<<<< HEAD - * @see elm_entry_text_filter_append() -======= * @see elm_entry_markup_filter_append() ->>>>>>> remotes/origin/upstream */ EAPI void elm_entry_entry_insert(Evas_Object *obj, const char *entry); @@ -1054,25 +925,6 @@ EAPI void elm_entry_context_menu_disabled_set(Evas_Object *obj, Ei EAPI Eina_Bool elm_entry_context_menu_disabled_get(const Evas_Object *obj); /** -<<<<<<< HEAD - * This disables the entry's magnifer feature. - * - * @param obj The entry object - * @param disabled If true, the magnifier is not displayed - */ - -EAPI void elm_entry_magnifier_disabled_set(Evas_Object *obj, Eina_Bool disabled); -/** - * This returns whether the entry's magnifier feature is disabled. - * - * @param obj The entry object - * @return If true, the feature is disabled - */ -EAPI Eina_Bool elm_entry_magnifier_disabled_get(const Evas_Object *obj); - -/** -======= ->>>>>>> remotes/origin/upstream * This appends a custom item provider to the list for that entry * * This appends the given callback. The list is walked from beginning to end @@ -1088,11 +940,7 @@ EAPI Eina_Bool elm_entry_magnifier_disabled_get(const Evas_Object *obj); * * @see @ref entry-items */ -<<<<<<< HEAD -EAPI void elm_entry_item_provider_append(Evas_Object *obj, Evas_Object * (*func)(void *data, Evas_Object * entry, const char *item), void *data); -======= EAPI void elm_entry_item_provider_append(Evas_Object *obj, Elm_Entry_Item_Provider_Cb func, void *data); ->>>>>>> remotes/origin/upstream /** * This prepends a custom item provider to the list for that entry @@ -1104,11 +952,7 @@ EAPI void elm_entry_item_provider_append(Evas_Object *obj, Elm_Ent * @param func The function called to provide the item object * @param data The data passed to @p func */ -<<<<<<< HEAD -EAPI void elm_entry_item_provider_prepend(Evas_Object *obj, Evas_Object * (*func)(void *data, Evas_Object * entry, const char *item), void *data); -======= EAPI void elm_entry_item_provider_prepend(Evas_Object *obj, Elm_Entry_Item_Provider_Cb func, void *data); ->>>>>>> remotes/origin/upstream /** * This removes a custom item provider to the list for that entry @@ -1120,17 +964,6 @@ EAPI void elm_entry_item_provider_prepend(Evas_Object *obj, Elm_En * @param func The function called to provide the item object * @param data The data passed to @p func */ -<<<<<<< HEAD -EAPI void elm_entry_item_provider_remove(Evas_Object *obj, Evas_Object * (*func)(void *data, Evas_Object * entry, const char *item), void *data); - -/** - * Append a filter function for text inserted in the entry - * - * Append the given callback to the list. This functions will be called - * whenever any text is inserted into the entry, with the text to be inserted - * as a parameter. The callback function is free to alter the text in any way - * it wants, but it must remember to free the given pointer and update it. -======= EAPI void elm_entry_item_provider_remove(Evas_Object *obj, Elm_Entry_Item_Provider_Cb func, void *data); /** @@ -1141,7 +974,6 @@ EAPI void elm_entry_item_provider_remove(Evas_Object *obj, Elm_Ent * as a parameter. The type of given text is always markup. * The callback function is free to alter the text in any way it wants, but * it must remember to free the given pointer and update it. ->>>>>>> remotes/origin/upstream * If the new text is to be discarded, the function can free it and set its * text parameter to NULL. This will also prevent any following filters from * being called. @@ -1150,36 +982,18 @@ EAPI void elm_entry_item_provider_remove(Evas_Object *obj, Elm_Ent * @param func The function to use as text filter * @param data User data to pass to @p func */ -<<<<<<< HEAD -EAPI void elm_entry_text_filter_append(Evas_Object *obj, Elm_Entry_Filter_Cb func, void *data); - -/** - * Prepend a filter function for text insdrted in the entry - * - * Prepend the given callback to the list. See elm_entry_text_filter_append() -======= EAPI void elm_entry_markup_filter_append(Evas_Object *obj, Elm_Entry_Filter_Cb func, void *data); /** * Prepend a markup filter function for text inserted in the entry * * Prepend the given callback to the list. See elm_entry_markup_filter_append() ->>>>>>> remotes/origin/upstream * for more information * * @param obj The entry object * @param func The function to use as text filter * @param data User data to pass to @p func */ -<<<<<<< HEAD -EAPI void elm_entry_text_filter_prepend(Evas_Object *obj, Elm_Entry_Filter_Cb func, void *data); - -/** - * Remove a filter from the list - * - * Removes the given callback from the filter list. See - * elm_entry_text_filter_append() for more information. -======= EAPI void elm_entry_markup_filter_prepend(Evas_Object *obj, Elm_Entry_Filter_Cb func, void *data); /** @@ -1187,17 +1001,12 @@ EAPI void elm_entry_markup_filter_prepend(Evas_Object *obj, Elm_En * * Removes the given callback from the filter list. See * elm_entry_markup_filter_append() for more information. ->>>>>>> remotes/origin/upstream * * @param obj The entry object * @param func The filter function to remove * @param data The user data passed when adding the function */ -<<<<<<< HEAD -EAPI void elm_entry_text_filter_remove(Evas_Object *obj, Elm_Entry_Filter_Cb func, void *data); -======= EAPI void elm_entry_markup_filter_remove(Evas_Object *obj, Elm_Entry_Filter_Cb func, void *data); ->>>>>>> remotes/origin/upstream /** * This converts a markup (HTML-like) string into UTF-8. @@ -1233,14 +1042,9 @@ EAPI char *elm_entry_utf8_to_markup(const char *s); * @param obj The entry object * @param file The path to the file to load and save * @param format The file format -<<<<<<< HEAD - */ -EAPI void elm_entry_file_set(Evas_Object *obj, const char *file, Elm_Text_Format format); -======= * @return @c EINA_TRUE on success, @c EINA_FALSE otherwise */ EAPI Eina_Bool elm_entry_file_set(Evas_Object *obj, const char *file, Elm_Text_Format format); ->>>>>>> remotes/origin/upstream /** * Gets the file being edited by the entry. @@ -1283,73 +1087,6 @@ EAPI void elm_entry_autosave_set(Evas_Object *obj, Eina_Bool autos EAPI Eina_Bool elm_entry_autosave_get(const Evas_Object *obj); /** -<<<<<<< HEAD - * Control pasting of text and images for the widget. - * - * Normally the entry allows both text and images to be pasted. - * By setting textonly to be ELM_CNP_MODE_NO_IMAGE, this prevents images from being copy or past. - * By setting textonly to be ELM_CNP_MODE_PLAINTEXT, this remove all tags in text . - * - * @note this only changes the behaviour of text. - * - * @param obj The entry object - * @param mode One of #Elm_CNP_Mode: #ELM_CNP_MODE_MARKUP, - * #ELM_CNP_MODE_NO_IMAGE, #ELM_CNP_MODE_PLAINTEXT. - */ -EAPI void elm_entry_cnp_mode_set(Evas_Object *obj, Elm_CNP_Mode cnp_mode); - -/** - * Getting elm_entry text paste/drop mode. - * - * Normally the entry allows both text and images to be pasted. - * This gets the copy & paste mode of the entry. - * - * @param obj The entry object - * @return mode One of #Elm_CNP_Mode: #ELM_CNP_MODE_MARKUP, - * #ELM_CNP_MODE_NO_IMAGE, #ELM_CNP_MODE_PLAINTEXT. - */ -EAPI Elm_CNP_Mode elm_entry_cnp_mode_get(const Evas_Object *obj); - -/** - * Control pasting of text and images for the widget. - * - * Normally the entry allows both text and images to be pasted. By setting - * textonly to be true, this prevents images from being pasted. - * - * Note this only changes the behaviour of text. - * - * @param obj The entry object - * @param textonly paste mode - EINA_TRUE is text only, EINA_FALSE is - * text+image+other. - */ - -/** - * Control pasting of text and images for the widget. - * - * Normally the entry allows both text and images to be pasted. By setting - * textonly to be true, this prevents images from being pasted. - * - * Note this only changes the behaviour of text. - * - * @param obj The entry object - * @param textonly paste mode - EINA_TRUE is text only, EINA_FALSE is - * text+image+other. - */ -EAPI void elm_entry_cnp_textonly_set(Evas_Object *obj, Eina_Bool textonly); - -/** - * Getting elm_entry text paste/drop mode. - * - * In textonly mode, only text may be pasted or dropped into the widget. - * - * @param obj The entry object - * @return If the widget only accepts text from pastes. - */ -EAPI Eina_Bool elm_entry_cnp_textonly_get(const Evas_Object *obj); - -/** -======= ->>>>>>> remotes/origin/upstream * Enable or disable scrolling in entry * * Normally the entry is not scrollable unless you enable it with this call. @@ -1371,56 +1108,34 @@ EAPI void elm_entry_scrollable_set(Evas_Object *obj, Eina_Bool scr EAPI Eina_Bool elm_entry_scrollable_get(const Evas_Object *obj); /** -<<<<<<< HEAD - * Sets the visibility of the left-side widget of the scrolled entry, - * set by elm_entry_icon_set(). - * - * @param obj The scrolled entry object -======= * Sets the visibility of the left-side widget of the entry, * set by elm_entry_icon_set(). * * @param obj The entry object ->>>>>>> remotes/origin/upstream * @param setting EINA_TRUE if the object should be displayed, * EINA_FALSE if not. */ EAPI void elm_entry_icon_visible_set(Evas_Object *obj, Eina_Bool setting); /** -<<<<<<< HEAD - * Sets the visibility of the end widget of the scrolled entry, set by - * elm_object_part_content_set(ent, "end", content). - * - * @param obj The scrolled entry object -======= * Sets the visibility of the end widget of the entry, set by * elm_object_part_content_set(ent, "end", content). * * @param obj The entry object ->>>>>>> remotes/origin/upstream * @param setting EINA_TRUE if the object should be displayed, * EINA_FALSE if not. */ EAPI void elm_entry_end_visible_set(Evas_Object *obj, Eina_Bool setting); /** -<<<<<<< HEAD - * This sets the scrolled entry's scrollbar policy (ie. enabling/disabling -======= * This sets the entry's scrollbar policy (i.e. enabling/disabling ->>>>>>> remotes/origin/upstream * them). * * Setting an entry to single-line mode with elm_entry_single_line_set() * will automatically disable the display of scrollbars when the entry * moves inside its scroller. * -<<<<<<< HEAD - * @param obj The scrolled entry object -======= * @param obj The entry object ->>>>>>> remotes/origin/upstream * @param h The horizontal scrollbar policy to apply * @param v The vertical scrollbar policy to apply */ @@ -1432,11 +1147,7 @@ EAPI void elm_entry_scrollbar_policy_set(Evas_Object *obj, Elm_Scr * This function sets whether the entry will bounce when scrolling reaches * the end of the contained entry. * -<<<<<<< HEAD - * @param obj The scrolled entry object -======= * @param obj The entry object ->>>>>>> remotes/origin/upstream * @param h_bounce The horizontal bounce state * @param v_bounce The vertical bounce state */ @@ -1505,11 +1216,7 @@ EAPI Eina_Bool elm_entry_input_panel_enabled_get(const Evas_Object * Show the input panel (virtual keyboard) based on the input panel property of entry such as layout, autocapital types, and so on. * * Note that input panel is shown or hidden automatically according to the focus state of entry widget. -<<<<<<< HEAD - * This API can be used in the case of manually controling by using elm_entry_input_panel_enabled_set(en, EINA_FALSE) -======= * This API can be used in the case of manually controlling by using elm_entry_input_panel_enabled_set(en, EINA_FALSE). ->>>>>>> remotes/origin/upstream * * @param obj The entry object */ @@ -1519,11 +1226,7 @@ EAPI void elm_entry_input_panel_show(Evas_Object *obj); * Hide the input panel (virtual keyboard). * * Note that input panel is shown or hidden automatically according to the focus state of entry widget. -<<<<<<< HEAD - * This API can be used in the case of manually controling by using elm_entry_input_panel_enabled_set(en, EINA_FALSE) -======= * This API can be used in the case of manually controlling by using elm_entry_input_panel_enabled_set(en, EINA_FALSE) ->>>>>>> remotes/origin/upstream * * @param obj The entry object */ @@ -1613,16 +1316,6 @@ EAPI Eina_Bool elm_entry_input_panel_return_key_disabled_get(const /** * Set whether the return key on the input panel is disabled automatically when entry has no text. * -<<<<<<< HEAD - * If @p on is EINA_TRUE, The return key on input panel is disabled when the entry has no text. - * The return Key on the input panel is automatically enabled when the entry has text. - * The default value is EINA_FALSE. - * - * @param obj The entry object - * @param on If @p on is EINA_TRUE, the return key is automatically disabled when the entry has no text. - */ -EAPI void elm_entry_input_panel_return_key_autoenabled_set(Evas_Object *obj, Eina_Bool on); -======= * If @p enabled is EINA_TRUE, The return key on input panel is disabled when the entry has no text. * The return key on the input panel is automatically enabled when the entry has text. * The default value is EINA_FALSE. @@ -1631,7 +1324,6 @@ EAPI void elm_entry_input_panel_return_key_autoenabled_set(Eva * @param enabled If @p enabled is EINA_TRUE, the return key is automatically disabled when the entry has no text. */ EAPI void elm_entry_input_panel_return_key_autoenabled_set(Evas_Object *obj, Eina_Bool enabled); ->>>>>>> remotes/origin/upstream /** * Reset the input method context of the entry if needed. @@ -1682,24 +1374,16 @@ struct _Elm_Entry_Filter_Limit_Size * * Add this filter to an entry to limit the characters that it will accept * based the the contents of the provided #Elm_Entry_Filter_Limit_Size. -<<<<<<< HEAD - * The funtion works on the UTF-8 representation of the string, converting -======= * The function works on the UTF-8 representation of the string, converting ->>>>>>> remotes/origin/upstream * it from the set markup, thus not accounting for any format in it. * * The user must create an #Elm_Entry_Filter_Limit_Size structure and pass * it as data when setting the filter. In it, it's possible to set limits * by character count or bytes (any of them is disabled if 0), and both can * be set at the same time. In that case, it first checks for characters, -<<<<<<< HEAD - * then bytes. -======= * then bytes. The #Elm_Entry_Filter_Limit_Size structure must be alive and * valid for as long as the entry is alive AND the elm_entry_filter_limit_size * filter is set. ->>>>>>> remotes/origin/upstream * * The function will cut the inserted text in order to allow only the first * number of characters that are still allowed. The cut is made in @@ -1735,12 +1419,8 @@ struct _Elm_Entry_Filter_Accept_Set * Add this filter to an entry to restrict the set of accepted characters * based on the sets in the provided #Elm_Entry_Filter_Accept_Set. * This structure contains both accepted and rejected sets, but they are -<<<<<<< HEAD - * mutually exclusive. -======= * mutually exclusive. This structure must be available for as long as * the entry is alive AND the elm_entry_filter_accept_set is being used. ->>>>>>> remotes/origin/upstream * * The @c accepted set takes preference, so if it is set, the filter will * only work based on the accepted characters, ignoring anything in the @@ -1754,10 +1434,6 @@ struct _Elm_Entry_Filter_Accept_Set */ EAPI void elm_entry_filter_accept_set(void *data, Evas_Object *entry, char **text); -<<<<<<< HEAD -EAPI Ecore_IMF_Context *elm_entry_imf_context_get(Evas_Object *obj); -EAPI void elm_entry_magnifier_type_set(Evas_Object *obj, int type); -======= /** * Returns the input method context of the entry. * @@ -1872,7 +1548,6 @@ EAPI const char *elm_entry_anchor_hover_style_get(const Evas_Obj * @param obj The entry object */ EAPI void elm_entry_anchor_hover_end(Evas_Object *obj); ->>>>>>> remotes/origin/upstream /** * @} -- 2.7.4