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

Windows CE clean up 

SVN revision: 55955
This commit is contained in:
Vincent Torri 2011-01-06 19:35:51 +00:00
parent b16da2d20f
commit 89b5e3fa75
5 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
legacy/ecore/src/lib/ecore_evas/ecore_evas_wince.c
View File

@ -814,8 +814,8 @@ ecore_evas_software_wince_new_internal(int backend,
} }
ecore_wince_window_backend_set((Ecore_WinCE_Window *)ee->prop.window, backend); ecore_wince_window_backend_set((Ecore_WinCE_Window *)ee->prop.window, backend);
ecore_wince_window_suspend_set((Ecore_WinCE_Window *)ee->prop.window, einfo->func.suspend); ecore_wince_window_suspend_cb_set((Ecore_WinCE_Window *)ee->prop.window, einfo->func.suspend);
ecore_wince_window_resume_set((Ecore_WinCE_Window *)ee->prop.window, einfo->func.resume); ecore_wince_window_resume_cb_set((Ecore_WinCE_Window *)ee->prop.window, einfo->func.resume);
} }
ee->engine.func->fn_render = _ecore_evas_wince_render; ee->engine.func->fn_render = _ecore_evas_wince_render;

4
legacy/ecore/src/lib/ecore_wince/Ecore_WinCE.h
View File

@ -280,9 +280,9 @@ EAPI void ecore_wince_window_title_set(Ecore_WinCE_Window *window,
EAPI void ecore_wince_window_backend_set(Ecore_WinCE_Window *window, int backend); EAPI void ecore_wince_window_backend_set(Ecore_WinCE_Window *window, int backend);
EAPI void ecore_wince_window_suspend_set(Ecore_WinCE_Window *window, int (*suspend_cb)(int)); EAPI void ecore_wince_window_suspend_cb_set(Ecore_WinCE_Window *window, int (*suspend_cb)(int));
EAPI void ecore_wince_window_resume_set(Ecore_WinCE_Window *window, int (*resume_cb)(int)); EAPI void ecore_wince_window_resume_cb_set(Ecore_WinCE_Window *window, int (*resume_cb)(int));
EAPI void ecore_wince_window_geometry_get(Ecore_WinCE_Window *window, EAPI void ecore_wince_window_geometry_get(Ecore_WinCE_Window *window,
int *x, int *x,

8
legacy/ecore/src/lib/ecore_wince/ecore_wince_event.c
View File

@ -734,8 +734,8 @@ _ecore_wince_event_handle_focus_in(Ecore_WinCE_Callback_Data *msg)
return; return;
} }
if (window->resume) if (window->resume_cb)
window->resume(window->backend); window->resume_cb(window->backend);
e->window = window; e->window = window;
@ -762,8 +762,8 @@ _ecore_wince_event_handle_focus_out(Ecore_WinCE_Callback_Data *msg)
free(e); free(e);
return; return;
} }
if (window->suspend) if (window->suspend_cb)
window->suspend(window->backend); window->suspend_cb(window->backend);
e->window = window; e->window = window;

18
legacy/ecore/src/lib/ecore_wince/ecore_wince_private.h
View File

@ -41,22 +41,22 @@ struct _Ecore_WinCE_Callback_Data
}; };
typedef int (*ecore_wince_suspend) (int); typedef int (*ecore_wince_suspend_cb) (int);
typedef int (*ecore_wince_resume) (int); typedef int (*ecore_wince_resume_cb) (int);
struct _Ecore_WinCE_Window struct _Ecore_WinCE_Window
{ {
HWND window; HWND window;
int backend; int backend;
ecore_wince_suspend suspend; ecore_wince_suspend_cb suspend_cb;
ecore_wince_resume resume; ecore_wince_resume_cb resume_cb;
RECT rect; /* used to go fullscreen to normal */ RECT rect; /* used to go fullscreen to normal */
unsigned int pointer_is_in : 1; unsigned int pointer_is_in : 1;
unsigned int fullscreen : 1; unsigned int fullscreen : 1;
}; };
extern HINSTANCE _ecore_wince_instance; extern HINSTANCE _ecore_wince_instance;

8
legacy/ecore/src/lib/ecore_wince/ecore_wince_window.c
View File

@ -501,7 +501,7 @@ ecore_wince_window_backend_set(Ecore_WinCE_Window *window,
* function should not be called if Ecore_Evas is used. * function should not be called if Ecore_Evas is used.
*/ */
EAPI void EAPI void
ecore_wince_window_suspend_set(Ecore_WinCE_Window *window, int (*suspend_cb)(int)) ecore_wince_window_suspend_cb_set(Ecore_WinCE_Window *window, int (*suspend_cb)(int))
{ {
struct _Ecore_WinCE_Window *w; struct _Ecore_WinCE_Window *w;
@ -511,7 +511,7 @@ ecore_wince_window_suspend_set(Ecore_WinCE_Window *window, int (*suspend_cb)(int
INF("setting suspend callback"); INF("setting suspend callback");
w = (struct _Ecore_WinCE_Window *)window; w = (struct _Ecore_WinCE_Window *)window;
w->suspend = suspend; w->suspend_cb = suspend_cb;
} }
/** /**
@ -527,7 +527,7 @@ ecore_wince_window_suspend_set(Ecore_WinCE_Window *window, int (*suspend_cb)(int
* function should not be called if Ecore_Evas is used. * function should not be called if Ecore_Evas is used.
*/ */
EAPI void EAPI void
ecore_wince_window_resume_set(Ecore_WinCE_Window *window, int (*resume_cb)(int)) ecore_wince_window_resume_cb_set(Ecore_WinCE_Window *window, int (*resume_cb)(int))
{ {
struct _Ecore_WinCE_Window *w; struct _Ecore_WinCE_Window *w;
@ -537,7 +537,7 @@ ecore_wince_window_resume_set(Ecore_WinCE_Window *window, int (*resume_cb)(int))
INF("setting resume callback"); INF("setting resume callback");
w = (struct _Ecore_WinCE_Window *)window; w = (struct _Ecore_WinCE_Window *)window;
w->resume = resume; w->resume_cb = resume_cb;
} }
/** /**