forked from enlightenment/efl
elementary: as suspected, that was a bad idea.
SVN revision: 80328
This commit is contained in:
parent
1a12d85dcc
commit
46daa66f8e
|
@ -5011,7 +5011,6 @@ _xwindow_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
|
|||
EAPI Ecore_Wl_Window *
|
||||
elm_win_wl_window_get(const Evas_Object *obj)
|
||||
{
|
||||
#if HAVE_ELEMENTARY_WAYLAND
|
||||
if (!obj) return NULL;
|
||||
|
||||
if (!evas_object_smart_type_check_ptr(obj, MY_CLASS_NAME))
|
||||
|
@ -5024,15 +5023,12 @@ elm_win_wl_window_get(const Evas_Object *obj)
|
|||
Ecore_Wl_Window *ret = NULL;
|
||||
eo_do((Eo *) obj, elm_obj_win_wl_window_get(&ret));
|
||||
return ret;
|
||||
#else
|
||||
return NULL;
|
||||
#endif
|
||||
}
|
||||
|
||||
#if HAVE_ELEMENTARY_WAYLAND
|
||||
static void
|
||||
_wl_window_get(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list)
|
||||
{
|
||||
#if HAVE_ELEMENTARY_WAYLAND
|
||||
Ecore_Wl_Window **ret = va_arg(*list, Ecore_Wl_Window **);
|
||||
Elm_Win_Smart_Data *sd = _pd;
|
||||
if (sd->wl.win)
|
||||
|
@ -5045,9 +5041,11 @@ _wl_window_get(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list)
|
|||
*ret = elm_win_wl_window_get(sd->parent);
|
||||
return;
|
||||
}
|
||||
#else
|
||||
(void) list;
|
||||
#endif
|
||||
*ret = NULL;
|
||||
}
|
||||
#endif
|
||||
|
||||
EAPI Eina_Bool
|
||||
elm_win_trap_set(const Elm_Win_Trap *t)
|
||||
|
@ -5204,9 +5202,7 @@ _class_constructor(Eo_Class *klass)
|
|||
EO_OP_FUNC(ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_FOCUS_HIGHLIGHT_STYLE_GET), _focus_highlight_style_get),
|
||||
EO_OP_FUNC(ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_SOCKET_LISTEN), _socket_listen),
|
||||
EO_OP_FUNC(ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_XWINDOW_GET), _xwindow_get),
|
||||
#if HAVE_ELEMENTARY_WAYLAND
|
||||
EO_OP_FUNC(ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_WL_WINDOW_GET), _wl_window_get),
|
||||
#endif
|
||||
EO_OP_FUNC_SENTINEL
|
||||
};
|
||||
|
||||
|
@ -5303,9 +5299,7 @@ static const Eo_Op_Description op_desc[] = {
|
|||
EO_OP_DESCRIPTION(ELM_OBJ_WIN_SUB_ID_FOCUS_HIGHLIGHT_STYLE_GET, "Get the style set for the focus highlight object."),
|
||||
EO_OP_DESCRIPTION(ELM_OBJ_WIN_SUB_ID_SOCKET_LISTEN, "Create a socket to provide the service for Plug widget."),
|
||||
EO_OP_DESCRIPTION(ELM_OBJ_WIN_SUB_ID_XWINDOW_GET, "Get the Ecore_X_Window of an Evas_Object."),
|
||||
#if HAVE_ELEMENTARY_WAYLAND
|
||||
EO_OP_DESCRIPTION(ELM_OBJ_WIN_SUB_ID_WL_WINDOW_GET, "Get the Ecore_Wl_Window of and Evas_Object."),
|
||||
#endif
|
||||
EO_OP_DESCRIPTION_SENTINEL
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in New Issue