diff options
| author | Cedric Bail <cedric.bail@free.fr> | 2013-03-16 15:54:18 +0900 |
|---|---|---|
| committer | Cedric Bail <cedric.bail@free.fr> | 2013-03-16 15:54:18 +0900 |
| commit | ba4db2c2416134af5556a4c8b797c4d5c9db551f (patch) | |
| tree | 871a2f0ca821847c4fe44eb438866dfb638a3262 | |
| parent | a4593c1cdfb7c3f463e5b192d788f5b7a7fc6f50 (diff) | |
| download | efl-ba4db2c2416134af5556a4c8b797c4d5c9db551f.tar.gz | |
ecore_evas: follow naming of other modules for Windows to.
| -rw-r--r-- | src/lib/ecore_evas/ecore_evas.c | 4 | ||||
| -rw-r--r-- | src/modules/ecore_evas/engines/win32/ecore_evas_win32.c | 62 |
2 files changed, 26 insertions, 40 deletions
diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c index fe520d3b06..247b189892 100644 --- a/src/lib/ecore_evas/ecore_evas.c +++ b/src/lib/ecore_evas/ecore_evas.c @@ -3336,7 +3336,7 @@ ecore_evas_software_gdi_new(Ecore_Win32_Window *parent, Eina_Module *m = _ecore_evas_engine_load("win32"); 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); 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_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); return new(parent, x, y, width, height); diff --git a/src/modules/ecore_evas/engines/win32/ecore_evas_win32.c b/src/modules/ecore_evas/engines/win32/ecore_evas_win32.c index af4647e9e6..84c4596c82 100644 --- a/src/modules/ecore_evas/engines/win32/ecore_evas_win32.c +++ b/src/modules/ecore_evas/engines/win32/ecore_evas_win32.c @@ -1310,67 +1310,53 @@ _ecore_evas_win32_new_internal(int (*_ecore_evas_engine_backend_init)(Ecore_Evas return ee; } -#ifdef BUILD_ECORE_EVAS_SOFTWARE_GDI - EAPI Ecore_Evas * -ecore_evas_software_gdi_new(Ecore_Win32_Window *parent, - int x, - int y, - int width, - int height) +ecore_evas_software_gdi_new_internal(Ecore_Win32_Window *parent, + int x, + int y, + int width, + int height) { +#ifdef BUILD_ECORE_EVAS_SOFTWARE_GDI return _ecore_evas_win32_new_internal(_ecore_evas_engine_software_gdi_init, parent, x, y, width, height); -} - #else - -EAPI Ecore_Evas * -ecore_evas_software_gdi_new(Ecore_Win32_Window *parent EINA_UNUSED, - int x EINA_UNUSED, - int y EINA_UNUSED, - int width EINA_UNUSED, - int height EINA_UNUSED) -{ + (void) parent; + (void) x; + (void) y; + (void) width; + (void) height; return NULL; +#endif } -#endif /* ! BUILD_ECORE_EVAS_SOFTWARE_GDI */ - -#ifdef BUILD_ECORE_EVAS_SOFTWARE_DDRAW - EAPI Ecore_Evas * -ecore_evas_software_ddraw_new(Ecore_Win32_Window *parent, - int x, - int y, - int width, - int height) +ecore_evas_software_ddraw_new_internal(Ecore_Win32_Window *parent, + int x, + int y, + int width, + int height) { +#ifdef BUILD_ECORE_EVAS_SOFTWARE_DDRAW return _ecore_evas_win32_new_internal(_ecore_evas_engine_software_ddraw_init, parent, x, y, width, height); -} - #else - -EAPI Ecore_Evas * -ecore_evas_software_ddraw_new(Ecore_Win32_Window *parent EINA_UNUSED, - int x EINA_UNUSED, - int y EINA_UNUSED, - int width EINA_UNUSED, - int height EINA_UNUSED) -{ + (void) parent; + (void) x; + (void) y; + (void) width; + (void) height; return NULL; -} - #endif /* ! BUILD_ECORE_EVAS_SOFTWARE_DDRAW */ +} static Ecore_Win32_Window * _ecore_evas_win32_window_get(const Ecore_Evas *ee) |