summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Torri <vincent dot torri at gmail dot com>2015-12-10 16:06:22 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2015-12-10 16:10:46 +0900
commit2cf3a9d2bef9872181c144e60a0d33c2833af015 (patch)
tree477face568a98c7c1e1bb3a3d2062b2aa66cd4bb
parent3585ee43369e78f91d2250e91c5f647af4262b76 (diff)
Fix compilation on Windows (and propably also on Mac)
Reviewers: cedric Differential Revision: https://phab.enlightenment.org/D3419
-rw-r--r--src/lib/elm_win.c16
-rw-r--r--src/lib/els_cursor.c5
2 files changed, 11 insertions, 10 deletions
diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 1f982c811..b9fb0cf29 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -2197,11 +2197,9 @@ _elm_ee_cocoa_win_get(const Ecore_Evas *ee)
2197 engine_name = ecore_evas_engine_name_get(ee); 2197 engine_name = ecore_evas_engine_name_get(ee);
2198 if (EINA_UNLIKELY(!engine_name)) return NULL; 2198 if (EINA_UNLIKELY(!engine_name)) return NULL;
2199 2199
2200 if ((!strcmp(engine_name, ELM_SOFTWARE_WIN32)) || 2200 if (!strcmp(engine_name, "opengl_cocoa") ||
2201 (!strcmp(engine_name, ELM_SOFTWARE_DDRAW))) 2201 !strcmp(engine_name, "gl_cocoa"))
2202 { 2202 return ecore_evas_cocoa_window_get(ee);
2203 return ecore_evas_win32_window_get(ee);
2204 }
2205#else 2203#else
2206 (void)ee; 2204 (void)ee;
2207#endif 2205#endif
@@ -2219,9 +2217,11 @@ _elm_ee_win32win_get(const Ecore_Evas *ee)
2219 engine_name = ecore_evas_engine_name_get(ee); 2217 engine_name = ecore_evas_engine_name_get(ee);
2220 if (EINA_UNLIKELY(!engine_name)) return NULL; 2218 if (EINA_UNLIKELY(!engine_name)) return NULL;
2221 2219
2222 if (!strcmp(engine_name, "opengl_cocoa") || 2220 if ((!strcmp(engine_name, ELM_SOFTWARE_WIN32)) ||
2223 !strcmp(engine_name, "gl_cocoa")) 2221 (!strcmp(engine_name, ELM_SOFTWARE_DDRAW)))
2224 return ecore_evas_cocoa_window_get(ee); 2222 {
2223 return ecore_evas_win32_window_get(ee);
2224 }
2225#else 2225#else
2226 (void)ee; 2226 (void)ee;
2227#endif 2227#endif
diff --git a/src/lib/els_cursor.c b/src/lib/els_cursor.c
index 68005542f..3b26209cc 100644
--- a/src/lib/els_cursor.c
+++ b/src/lib/els_cursor.c
@@ -15,6 +15,7 @@
15#ifdef HAVE_ELEMENTARY_COCOA 15#ifdef HAVE_ELEMENTARY_COCOA
16# include <Ecore_Cocoa_Cursor.h> 16# include <Ecore_Cocoa_Cursor.h>
17#endif 17#endif
18
18#ifdef HAVE_ELEMENTARY_WIN32 19#ifdef HAVE_ELEMENTARY_WIN32
19#include <Ecore_Win32.h> 20#include <Ecore_Win32.h>
20#endif 21#endif
@@ -40,7 +41,7 @@ struct _Cursor_Id
40#elif defined(HAVE_ELEMENTARY_COCOA) 41#elif defined(HAVE_ELEMENTARY_COCOA)
41# define CURSOR(_name, _id, _cid) {_name, -1, _cid} 42# define CURSOR(_name, _id, _cid) {_name, -1, _cid}
42#elif defined(HAVE_ELEMENTARY_WIN32) 43#elif defined(HAVE_ELEMENTARY_WIN32)
43# define CURSOR(_name, _id, _cid) {_name, ECORE_WIN32_CURSOR_X11_SHAPE_##_xid, -1 } 44# define CURSOR(_name, _id, _cid) {_name, ECORE_WIN32_CURSOR_X11_SHAPE_##_id, -1 }
44#else 45#else
45# define CURSOR(_name, _id, _cid) { _name } 46# define CURSOR(_name, _id, _cid) { _name }
46#endif 47#endif
@@ -505,7 +506,7 @@ _elm_cursor_cur_set(Elm_Cursor *cur)
505 cur->win32.cursor = ecore_win32_cursor_shaped_new(ECORE_WIN32_CURSOR_SHAPE_ARROW); 506 cur->win32.cursor = ecore_win32_cursor_shaped_new(ECORE_WIN32_CURSOR_SHAPE_ARROW);
506 } 507 }
507 else 508 else
508 cur->win32.cursor = ecore_win32_cursor_x11_shaped_get(cur_id->id); 509 cur->win32.cursor = (Ecore_Win32_Cursor *)ecore_win32_cursor_x11_shaped_get(cur_id->id);
509 } 510 }
510#endif 511#endif
511 } 512 }