forked from enlightenment/efl
ecore-evas: Rename ecore_evas_wayland_window_get2 function
This renames the ecore_evas_wayland_window_get2 function to be ecore_evas_wayland2_window_get before the 1.17 roll out. Signed-off-by: Chris Michael <cpmichael@osg.samsung.com>
This commit is contained in:
parent
5499a53c75
commit
99ac0763ab
|
@ -1316,7 +1316,7 @@ EAPI void ecore_evas_wayland_move(Ecore_Evas *ee, int x, int y);
|
||||||
EAPI void ecore_evas_wayland_pointer_set(Ecore_Evas *ee, int hot_x, int hot_y);
|
EAPI void ecore_evas_wayland_pointer_set(Ecore_Evas *ee, int hot_x, int hot_y);
|
||||||
EAPI void ecore_evas_wayland_type_set(Ecore_Evas *ee, int type);
|
EAPI void ecore_evas_wayland_type_set(Ecore_Evas *ee, int type);
|
||||||
EAPI Ecore_Wl_Window *ecore_evas_wayland_window_get(const Ecore_Evas *ee);
|
EAPI Ecore_Wl_Window *ecore_evas_wayland_window_get(const Ecore_Evas *ee);
|
||||||
EAPI Ecore_Wl2_Window *ecore_evas_wayland_window_get2(const Ecore_Evas *ee); /** @since 1.17 */
|
EAPI Ecore_Wl2_Window *ecore_evas_wayland2_window_get(const Ecore_Evas *ee); /** @since 1.17 */
|
||||||
|
|
||||||
EAPI Ecore_Cocoa_Window *ecore_evas_cocoa_window_get(const Ecore_Evas *ee); /** @since 1.17 */
|
EAPI Ecore_Cocoa_Window *ecore_evas_cocoa_window_get(const Ecore_Evas *ee); /** @since 1.17 */
|
||||||
|
|
||||||
|
|
|
@ -3998,13 +3998,13 @@ ecore_evas_cocoa_window_get(const Ecore_Evas *ee)
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI Ecore_Wl2_Window *
|
EAPI Ecore_Wl2_Window *
|
||||||
ecore_evas_wayland_window_get2(const Ecore_Evas *ee)
|
ecore_evas_wayland2_window_get(const Ecore_Evas *ee)
|
||||||
{
|
{
|
||||||
Ecore_Evas_Interface_Wayland *iface;
|
Ecore_Evas_Interface_Wayland *iface;
|
||||||
iface = (Ecore_Evas_Interface_Wayland *)_ecore_evas_interface_get(ee, "wayland");
|
iface = (Ecore_Evas_Interface_Wayland *)_ecore_evas_interface_get(ee, "wayland");
|
||||||
EINA_SAFETY_ON_NULL_RETURN_VAL(iface, NULL);
|
EINA_SAFETY_ON_NULL_RETURN_VAL(iface, NULL);
|
||||||
|
|
||||||
return iface->window_get2(ee);
|
return iface->window2_get(ee);
|
||||||
}
|
}
|
||||||
|
|
||||||
EAPI Ecore_Evas *
|
EAPI Ecore_Evas *
|
||||||
|
|
|
@ -12,7 +12,7 @@ struct _Ecore_Evas_Interface_Wayland
|
||||||
void (*pointer_set)(Ecore_Evas *ee, int hot_x, int hot_y);
|
void (*pointer_set)(Ecore_Evas *ee, int hot_x, int hot_y);
|
||||||
void (*type_set)(Ecore_Evas *ee, int type);
|
void (*type_set)(Ecore_Evas *ee, int type);
|
||||||
Ecore_Wl_Window* (*window_get)(const Ecore_Evas *ee);
|
Ecore_Wl_Window* (*window_get)(const Ecore_Evas *ee);
|
||||||
Ecore_Wl2_Window *(*window_get2)(const Ecore_Evas *ee);
|
Ecore_Wl2_Window *(*window2_get)(const Ecore_Evas *ee);
|
||||||
void (*pre_post_swap_callback_set)(const Ecore_Evas *ee, void *data, void (*pre_cb) (void *data, Evas *e), void (*post_cb) (void *data, Evas *e));
|
void (*pre_post_swap_callback_set)(const Ecore_Evas *ee, void *data, void (*pre_cb) (void *data, Evas *e), void (*post_cb) (void *data, Evas *e));
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -1561,7 +1561,7 @@ _ecore_evas_wl_interface_new(void)
|
||||||
iface->move = _ecore_evas_wayland_move;
|
iface->move = _ecore_evas_wayland_move;
|
||||||
/* iface->pointer_set = _ecore_evas_wayland_pointer_set; */
|
/* iface->pointer_set = _ecore_evas_wayland_pointer_set; */
|
||||||
iface->type_set = _ecore_evas_wayland_type_set;
|
iface->type_set = _ecore_evas_wayland_type_set;
|
||||||
iface->window_get2 = _ecore_evas_wayland_window_get;
|
iface->window2_get = _ecore_evas_wayland_window_get;
|
||||||
|
|
||||||
#ifdef BUILD_ECORE_EVAS_WAYLAND_EGL
|
#ifdef BUILD_ECORE_EVAS_WAYLAND_EGL
|
||||||
iface->pre_post_swap_callback_set =
|
iface->pre_post_swap_callback_set =
|
||||||
|
|
Loading…
Reference in New Issue