kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

core fixup of elm cnp to be able to work regardless ofr display 

backend and isolate x11 specific stuff in its own fat ifdef and
functions/vars.



SVN revision: 75523
This commit is contained in:
Carsten Haitzler 2012-08-22 08:33:43 +00:00
parent a0a78332cd
commit 2e83d89fc8
4 changed files with 591 additions and 659 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1151
legacy/elementary/src/lib/elm_cnp.c
View File

File diff suppressed because it is too large Load Diff

5
legacy/elementary/src/lib/elm_cnp.h
View File

@ -183,11 +183,12 @@ EAPI Eina_Bool elm_object_cnp_selection_clear(Evas_Object *obj,
* *
* @code * @code
* elm_cnp_selection_set(obj, ELM_SEL_TYPE_PRIMARY, ELM_SEL_FORMAT_TEXT, "hello", strlen(hello)); * elm_cnp_selection_set(obj, ELM_SEL_TYPE_PRIMARY, ELM_SEL_FORMAT_TEXT, "hello", strlen(hello));
* elm_cnp_selection_loss_callback_set(ELM_SEL_TYPE_PRIMARY, loss_cb, NULL); * elm_cnp_selection_loss_callback_set(obj, ELM_SEL_TYPE_PRIMARY, loss_cb, NULL);
* @endcode * @endcode
* *
* @see also elm_cnp_selection_set() * @see also elm_cnp_selection_set()
* *
* @param obj The object to indicate the window target/display system.
* @param selection Selection to be notified of for loss * @param selection Selection to be notified of for loss
* @param func The function to call * @param func The function to call
* @param data The data pointer passed to the function. * @param data The data pointer passed to the function.
@ -196,7 +197,7 @@ EAPI Eina_Bool elm_object_cnp_selection_clear(Evas_Object *obj,
* *
* @since 1.7 * @since 1.7
*/ */
EAPI void elm_cnp_selection_loss_callback_set(Elm_Sel_Type selection, Elm_Selection_Loss_Cb func, const void *data); EAPI void elm_cnp_selection_loss_callback_set(Evas_Object *obj, Elm_Sel_Type selection, Elm_Selection_Loss_Cb func, const void *data);
/** /**
* @} * @}

2
legacy/elementary/src/lib/elm_entry.c
View File

@ -1401,7 +1401,7 @@ _menu_press(Evas_Object *obj)
elm_hoversel_item_add(wd->hoversel, E_("Select"), NULL, ELM_ICON_NONE, elm_hoversel_item_add(wd->hoversel, E_("Select"), NULL, ELM_ICON_NONE,
_select, obj); _select, obj);
} }
if (elm_selection_selection_has_owner()) if (elm_selection_selection_has_owner(obj))
{ {
if (wd->editable) if (wd->editable)
elm_hoversel_item_add(wd->hoversel, E_("Paste"), NULL, ELM_ICON_NONE, elm_hoversel_item_add(wd->hoversel, E_("Paste"), NULL, ELM_ICON_NONE,

6
legacy/elementary/src/lib/elm_widget.h
View File

@ -1095,9 +1095,9 @@ EAPI void elm_widget_tree_dot_dump(const Evas_Object *top, FILE *out
* And yes, elm_widget, should probably be elm_experimental... * And yes, elm_widget, should probably be elm_experimental...
* Complaints about this code should go to /dev/null, or failing that nash. * Complaints about this code should go to /dev/null, or failing that nash.
*/ */
EAPI Eina_Bool elm_selection_selection_has_owner(void); EAPI Eina_Bool elm_drop_target_add(Evas_Object *widget, Elm_Sel_Type, Elm_Drop_Cb, void *);
Eina_Bool elm_drop_target_add(Evas_Object *widget, Elm_Sel_Type, Elm_Drop_Cb, void *);
EAPI Eina_Bool elm_drop_target_del(Evas_Object *widget); EAPI Eina_Bool elm_drop_target_del(Evas_Object *widget);
EAPI Eina_Bool elm_drag_start(Evas_Object *, Elm_Sel_Format, const char *, void (*)(void *, Evas_Object *), void *); EAPI Eina_Bool elm_drag_start(Evas_Object *obj, Elm_Sel_Format format, const char *data, void (*dragdone) (void *data, Evas_Object *), void *donecbdata);
EAPI Eina_Bool elm_selection_selection_has_owner(Evas_Object *obj);
#endif #endif