borisfaure
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ecore_evas: follow naming of other modules for Windows to.

This commit is contained in:
Cedric Bail 2013-03-16 15:54:18 +09:00
parent a4593c1cdf
commit ba4db2c241
2 changed files with 26 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/ecore_evas/ecore_evas.c
View File

@ -3336,7 +3336,7 @@ ecore_evas_software_gdi_new(Ecore_Win32_Window *parent,
Eina_Module *m = _ecore_evas_engine_load("win32"); Eina_Module *m = _ecore_evas_engine_load("win32");
EINA_SAFETY_ON_NULL_RETURN_VAL(m, NULL); EINA_SAFETY_ON_NULL_RETURN_VAL(m, NULL);
new = eina_module_symbol_get(m, "ecore_evas_software_gdi_new"); new = eina_module_symbol_get(m, "ecore_evas_software_gdi_new_internal");
EINA_SAFETY_ON_NULL_RETURN_VAL(new, NULL); EINA_SAFETY_ON_NULL_RETURN_VAL(new, NULL);
return new(parent, x, y, width, height); return new(parent, x, y, width, height);
@ -3353,7 +3353,7 @@ ecore_evas_software_ddraw_new(Ecore_Win32_Window *parent,
Eina_Module *m = _ecore_evas_engine_load("win32"); Eina_Module *m = _ecore_evas_engine_load("win32");
EINA_SAFETY_ON_NULL_RETURN_VAL(m, NULL); EINA_SAFETY_ON_NULL_RETURN_VAL(m, NULL);
new = eina_module_symbol_get(m, "ecore_evas_software_ddraw_new"); new = eina_module_symbol_get(m, "ecore_evas_software_ddraw_new_internal");
EINA_SAFETY_ON_NULL_RETURN_VAL(new, NULL); EINA_SAFETY_ON_NULL_RETURN_VAL(new, NULL);
return new(parent, x, y, width, height); return new(parent, x, y, width, height);

62
src/modules/ecore_evas/engines/win32/ecore_evas_win32.c
View File

@ -1310,67 +1310,53 @@ _ecore_evas_win32_new_internal(int (*_ecore_evas_engine_backend_init)(Ecore_Evas
return ee; return ee;
} }
#ifdef BUILD_ECORE_EVAS_SOFTWARE_GDI
EAPI Ecore_Evas * EAPI Ecore_Evas *
ecore_evas_software_gdi_new(Ecore_Win32_Window *parent, ecore_evas_software_gdi_new_internal(Ecore_Win32_Window *parent,
int x, int x,
int y, int y,
int width, int width,
int height) int height)
{ {
#ifdef BUILD_ECORE_EVAS_SOFTWARE_GDI
return _ecore_evas_win32_new_internal(_ecore_evas_engine_software_gdi_init, return _ecore_evas_win32_new_internal(_ecore_evas_engine_software_gdi_init,
parent, parent,
x, x,
y, y,
width, width,
height); height);
}
#else #else
(void) parent;
EAPI Ecore_Evas * (void) x;
ecore_evas_software_gdi_new(Ecore_Win32_Window *parent EINA_UNUSED, (void) y;
int x EINA_UNUSED, (void) width;
int y EINA_UNUSED, (void) height;
int width EINA_UNUSED,
int height EINA_UNUSED)
{
return NULL; return NULL;
#endif
} }
#endif /* ! BUILD_ECORE_EVAS_SOFTWARE_GDI */
#ifdef BUILD_ECORE_EVAS_SOFTWARE_DDRAW
EAPI Ecore_Evas * EAPI Ecore_Evas *
ecore_evas_software_ddraw_new(Ecore_Win32_Window *parent, ecore_evas_software_ddraw_new_internal(Ecore_Win32_Window *parent,
int x, int x,
int y, int y,
int width, int width,
int height) int height)
{ {
#ifdef BUILD_ECORE_EVAS_SOFTWARE_DDRAW
return _ecore_evas_win32_new_internal(_ecore_evas_engine_software_ddraw_init, return _ecore_evas_win32_new_internal(_ecore_evas_engine_software_ddraw_init,
parent, parent,
x, x,
y, y,
width, width,
height); height);
}
#else #else
(void) parent;
EAPI Ecore_Evas * (void) x;
ecore_evas_software_ddraw_new(Ecore_Win32_Window *parent EINA_UNUSED, (void) y;
int x EINA_UNUSED, (void) width;
int y EINA_UNUSED, (void) height;
int width EINA_UNUSED,
int height EINA_UNUSED)
{
return NULL; return NULL;
}
#endif /* ! BUILD_ECORE_EVAS_SOFTWARE_DDRAW */ #endif /* ! BUILD_ECORE_EVAS_SOFTWARE_DDRAW */
}
static Ecore_Win32_Window * static Ecore_Win32_Window *
_ecore_evas_win32_window_get(const Ecore_Evas *ee) _ecore_evas_win32_window_get(const Ecore_Evas *ee)