diff options
author | Chris Michael <cpmichael@osg.samsung.com> | 2016-01-07 15:02:13 -0500 |
---|---|---|
committer | Chris Michael <cpmichael@osg.samsung.com> | 2016-01-07 15:02:13 -0500 |
commit | 99ac0763ab89af93c38b69e87547815c0eb2c46a (patch) | |
tree | 179c1200771aa83a0e8d1f390ff5202083dced4f /src/lib/ecore_evas | |
parent | 5499a53c7568a2c889f5b7db82161583fff24bf7 (diff) |
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>
Diffstat (limited to '')
-rw-r--r-- | src/lib/ecore_evas/Ecore_Evas.h | 2 | ||||
-rw-r--r-- | src/lib/ecore_evas/ecore_evas.c | 4 | ||||
-rw-r--r-- | src/lib/ecore_evas/ecore_evas_wayland.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/ecore_evas/Ecore_Evas.h b/src/lib/ecore_evas/Ecore_Evas.h index 3514d6b6a7..30e45b1756 100644 --- a/src/lib/ecore_evas/Ecore_Evas.h +++ b/src/lib/ecore_evas/Ecore_Evas.h | |||
@@ -1316,7 +1316,7 @@ EAPI void ecore_evas_wayland_move(Ecore_Evas *ee, int x, int y); | |||
1316 | EAPI void ecore_evas_wayland_pointer_set(Ecore_Evas *ee, int hot_x, int hot_y); | 1316 | EAPI void ecore_evas_wayland_pointer_set(Ecore_Evas *ee, int hot_x, int hot_y); |
1317 | EAPI void ecore_evas_wayland_type_set(Ecore_Evas *ee, int type); | 1317 | EAPI void ecore_evas_wayland_type_set(Ecore_Evas *ee, int type); |
1318 | EAPI Ecore_Wl_Window *ecore_evas_wayland_window_get(const Ecore_Evas *ee); | 1318 | EAPI Ecore_Wl_Window *ecore_evas_wayland_window_get(const Ecore_Evas *ee); |
1319 | EAPI Ecore_Wl2_Window *ecore_evas_wayland_window_get2(const Ecore_Evas *ee); /** @since 1.17 */ | 1319 | EAPI Ecore_Wl2_Window *ecore_evas_wayland2_window_get(const Ecore_Evas *ee); /** @since 1.17 */ |
1320 | 1320 | ||
1321 | EAPI Ecore_Cocoa_Window *ecore_evas_cocoa_window_get(const Ecore_Evas *ee); /** @since 1.17 */ | 1321 | EAPI Ecore_Cocoa_Window *ecore_evas_cocoa_window_get(const Ecore_Evas *ee); /** @since 1.17 */ |
1322 | 1322 | ||
diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c index 076b3f5001..d3e3f28b9c 100644 --- a/src/lib/ecore_evas/ecore_evas.c +++ b/src/lib/ecore_evas/ecore_evas.c | |||
@@ -3998,13 +3998,13 @@ ecore_evas_cocoa_window_get(const Ecore_Evas *ee) | |||
3998 | } | 3998 | } |
3999 | 3999 | ||
4000 | EAPI Ecore_Wl2_Window * | 4000 | EAPI Ecore_Wl2_Window * |
4001 | ecore_evas_wayland_window_get2(const Ecore_Evas *ee) | 4001 | ecore_evas_wayland2_window_get(const Ecore_Evas *ee) |
4002 | { | 4002 | { |
4003 | Ecore_Evas_Interface_Wayland *iface; | 4003 | Ecore_Evas_Interface_Wayland *iface; |
4004 | iface = (Ecore_Evas_Interface_Wayland *)_ecore_evas_interface_get(ee, "wayland"); | 4004 | iface = (Ecore_Evas_Interface_Wayland *)_ecore_evas_interface_get(ee, "wayland"); |
4005 | EINA_SAFETY_ON_NULL_RETURN_VAL(iface, NULL); | 4005 | EINA_SAFETY_ON_NULL_RETURN_VAL(iface, NULL); |
4006 | 4006 | ||
4007 | return iface->window_get2(ee); | 4007 | return iface->window2_get(ee); |
4008 | } | 4008 | } |
4009 | 4009 | ||
4010 | EAPI Ecore_Evas * | 4010 | EAPI Ecore_Evas * |
diff --git a/src/lib/ecore_evas/ecore_evas_wayland.h b/src/lib/ecore_evas/ecore_evas_wayland.h index ab3894e7ee..b75f779f2a 100644 --- a/src/lib/ecore_evas/ecore_evas_wayland.h +++ b/src/lib/ecore_evas/ecore_evas_wayland.h | |||
@@ -12,7 +12,7 @@ struct _Ecore_Evas_Interface_Wayland | |||
12 | void (*pointer_set)(Ecore_Evas *ee, int hot_x, int hot_y); | 12 | void (*pointer_set)(Ecore_Evas *ee, int hot_x, int hot_y); |
13 | void (*type_set)(Ecore_Evas *ee, int type); | 13 | void (*type_set)(Ecore_Evas *ee, int type); |
14 | Ecore_Wl_Window* (*window_get)(const Ecore_Evas *ee); | 14 | Ecore_Wl_Window* (*window_get)(const Ecore_Evas *ee); |
15 | Ecore_Wl2_Window *(*window_get2)(const Ecore_Evas *ee); | 15 | Ecore_Wl2_Window *(*window2_get)(const Ecore_Evas *ee); |
16 | 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)); | 16 | 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)); |
17 | }; | 17 | }; |
18 | 18 | ||