forked from enlightenment/efl
Fix compilation on Windows (and propably also on Mac)
Reviewers: cedric Differential Revision: https://phab.enlightenment.org/D3419
This commit is contained in:
parent
616a0c1832
commit
b51e267447
|
@ -2197,11 +2197,9 @@ _elm_ee_cocoa_win_get(const Ecore_Evas *ee)
|
|||
engine_name = ecore_evas_engine_name_get(ee);
|
||||
if (EINA_UNLIKELY(!engine_name)) return NULL;
|
||||
|
||||
if ((!strcmp(engine_name, ELM_SOFTWARE_WIN32)) ||
|
||||
(!strcmp(engine_name, ELM_SOFTWARE_DDRAW)))
|
||||
{
|
||||
return ecore_evas_win32_window_get(ee);
|
||||
}
|
||||
if (!strcmp(engine_name, "opengl_cocoa") ||
|
||||
!strcmp(engine_name, "gl_cocoa"))
|
||||
return ecore_evas_cocoa_window_get(ee);
|
||||
#else
|
||||
(void)ee;
|
||||
#endif
|
||||
|
@ -2219,9 +2217,11 @@ _elm_ee_win32win_get(const Ecore_Evas *ee)
|
|||
engine_name = ecore_evas_engine_name_get(ee);
|
||||
if (EINA_UNLIKELY(!engine_name)) return NULL;
|
||||
|
||||
if (!strcmp(engine_name, "opengl_cocoa") ||
|
||||
!strcmp(engine_name, "gl_cocoa"))
|
||||
return ecore_evas_cocoa_window_get(ee);
|
||||
if ((!strcmp(engine_name, ELM_SOFTWARE_WIN32)) ||
|
||||
(!strcmp(engine_name, ELM_SOFTWARE_DDRAW)))
|
||||
{
|
||||
return ecore_evas_win32_window_get(ee);
|
||||
}
|
||||
#else
|
||||
(void)ee;
|
||||
#endif
|
||||
|
|
|
@ -15,6 +15,7 @@
|
|||
#ifdef HAVE_ELEMENTARY_COCOA
|
||||
# include <Ecore_Cocoa_Cursor.h>
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_ELEMENTARY_WIN32
|
||||
#include <Ecore_Win32.h>
|
||||
#endif
|
||||
|
@ -40,7 +41,7 @@ struct _Cursor_Id
|
|||
#elif defined(HAVE_ELEMENTARY_COCOA)
|
||||
# define CURSOR(_name, _id, _cid) {_name, -1, _cid}
|
||||
#elif defined(HAVE_ELEMENTARY_WIN32)
|
||||
# define CURSOR(_name, _id, _cid) {_name, ECORE_WIN32_CURSOR_X11_SHAPE_##_xid, -1 }
|
||||
# define CURSOR(_name, _id, _cid) {_name, ECORE_WIN32_CURSOR_X11_SHAPE_##_id, -1 }
|
||||
#else
|
||||
# define CURSOR(_name, _id, _cid) { _name }
|
||||
#endif
|
||||
|
@ -505,7 +506,7 @@ _elm_cursor_cur_set(Elm_Cursor *cur)
|
|||
cur->win32.cursor = ecore_win32_cursor_shaped_new(ECORE_WIN32_CURSOR_SHAPE_ARROW);
|
||||
}
|
||||
else
|
||||
cur->win32.cursor = ecore_win32_cursor_x11_shaped_get(cur_id->id);
|
||||
cur->win32.cursor = (Ecore_Win32_Cursor *)ecore_win32_cursor_x11_shaped_get(cur_id->id);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue