summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2014-05-20 11:32:19 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2014-05-20 11:37:30 +0900
commit60c0a8d9c9e82445c319cee5e775eaeba151befe (patch)
treeba0326c627fe1fc888321b62a9168a41a6b339e9
parent765072abd3635cb68365a1cdd8a5351513d78e0f (diff)
elm_cnp: Fix build for windows (ecore_x)
-rw-r--r--src/lib/elm_cnp.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/elm_cnp.c b/src/lib/elm_cnp.c
index 2d5f4b91b..7c02611a6 100644
--- a/src/lib/elm_cnp.c
+++ b/src/lib/elm_cnp.c
@@ -181,15 +181,19 @@ static Eina_List *cont_drag_tg = NULL; /* List of Item_Container_Drag_Info */
181static void _cont_obj_mouse_up( void *data, Evas *e, Evas_Object *obj, void *event_info); 181static void _cont_obj_mouse_up( void *data, Evas *e, Evas_Object *obj, void *event_info);
182static void _cont_obj_mouse_move( void *data, Evas *e, Evas_Object *obj, void *event_info); 182static void _cont_obj_mouse_move( void *data, Evas *e, Evas_Object *obj, void *event_info);
183static void _all_drop_targets_cbs_del(void *data, Evas *e, Evas_Object *obj, void *info); 183static void _all_drop_targets_cbs_del(void *data, Evas *e, Evas_Object *obj, void *info);
184#ifdef HAVE_ELEMENTARY_X
184static Ecore_X_Window _x11_elm_widget_xwin_get(const Evas_Object *obj); 185static Ecore_X_Window _x11_elm_widget_xwin_get(const Evas_Object *obj);
186#endif
185 187
186static Eina_Bool 188static Eina_Bool
187_drag_cancel_animate(void *data EINA_UNUSED, double pos) 189_drag_cancel_animate(void *data EINA_UNUSED, double pos)
188{ /* Animation to "move back" drag-window */ 190{ /* Animation to "move back" drag-window */
189 if (pos >= 0.99) 191 if (pos >= 0.99)
190 { 192 {
193#ifdef HAVE_ELEMENTARY_X
191 Ecore_X_Window xdragwin = _x11_elm_widget_xwin_get(data); 194 Ecore_X_Window xdragwin = _x11_elm_widget_xwin_get(data);
192 ecore_x_window_ignore_set(xdragwin, 0); 195 ecore_x_window_ignore_set(xdragwin, 0);
196#endif
193 evas_object_del(data); 197 evas_object_del(data);
194 return ECORE_CALLBACK_CANCEL; 198 return ECORE_CALLBACK_CANCEL;
195 } 199 }
@@ -304,8 +308,6 @@ static Eina_Bool _x11_dnd_leave (void *data EINA_UNUSED, int
304static Eina_Bool _x11_drag_mouse_up (void *data, int etype EINA_UNUSED, void *event); 308static Eina_Bool _x11_drag_mouse_up (void *data, int etype EINA_UNUSED, void *event);
305static void _x11_drag_move (void *data EINA_UNUSED, Ecore_X_Xdnd_Position *pos); 309static void _x11_drag_move (void *data EINA_UNUSED, Ecore_X_Xdnd_Position *pos);
306 310
307static Ecore_X_Window _x11_elm_widget_xwin_get (const Evas_Object *obj);
308
309static Eina_Bool _x11_elm_cnp_init (void); 311static Eina_Bool _x11_elm_cnp_init (void);
310static Eina_Bool _x11_elm_cnp_selection_set (Ecore_X_Window xwin, Evas_Object *obj, Elm_Sel_Type selection, Elm_Sel_Format format, const void *selbuf, size_t buflen); 312static Eina_Bool _x11_elm_cnp_selection_set (Ecore_X_Window xwin, Evas_Object *obj, Elm_Sel_Type selection, Elm_Sel_Format format, const void *selbuf, size_t buflen);
311static void _x11_elm_cnp_selection_loss_callback_set(Evas_Object *obj EINA_UNUSED, Elm_Sel_Type selection, Elm_Selection_Loss_Cb func, const void *data); 313static void _x11_elm_cnp_selection_loss_callback_set(Evas_Object *obj EINA_UNUSED, Elm_Sel_Type selection, Elm_Selection_Loss_Cb func, const void *data);