From 89b5e3fa75916a990377692b24a59283a01b1cdc Mon Sep 17 00:00:00 2001 From: Vincent Torri Date: Thu, 6 Jan 2011 19:35:51 +0000 Subject: [PATCH] Windows CE clean up SVN revision: 55955 --- .../src/lib/ecore_evas/ecore_evas_wince.c | 4 ++-- legacy/ecore/src/lib/ecore_wince/Ecore_WinCE.h | 4 ++-- .../src/lib/ecore_wince/ecore_wince_event.c | 8 ++++---- .../src/lib/ecore_wince/ecore_wince_private.h | 18 +++++++++--------- .../src/lib/ecore_wince/ecore_wince_window.c | 8 ++++---- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_wince.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas_wince.c index 3a2e444cbb..ef17beaba2 100644 --- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_wince.c +++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_wince.c @@ -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_suspend_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_suspend_cb_set((Ecore_WinCE_Window *)ee->prop.window, einfo->func.suspend); + ecore_wince_window_resume_cb_set((Ecore_WinCE_Window *)ee->prop.window, einfo->func.resume); } ee->engine.func->fn_render = _ecore_evas_wince_render; diff --git a/legacy/ecore/src/lib/ecore_wince/Ecore_WinCE.h b/legacy/ecore/src/lib/ecore_wince/Ecore_WinCE.h index 160886a4c0..6884e17fb4 100644 --- a/legacy/ecore/src/lib/ecore_wince/Ecore_WinCE.h +++ b/legacy/ecore/src/lib/ecore_wince/Ecore_WinCE.h @@ -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_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, int *x, diff --git a/legacy/ecore/src/lib/ecore_wince/ecore_wince_event.c b/legacy/ecore/src/lib/ecore_wince/ecore_wince_event.c index 5193fa071c..b1a2a2f3fb 100644 --- a/legacy/ecore/src/lib/ecore_wince/ecore_wince_event.c +++ b/legacy/ecore/src/lib/ecore_wince/ecore_wince_event.c @@ -734,8 +734,8 @@ _ecore_wince_event_handle_focus_in(Ecore_WinCE_Callback_Data *msg) return; } - if (window->resume) - window->resume(window->backend); + if (window->resume_cb) + window->resume_cb(window->backend); e->window = window; @@ -762,8 +762,8 @@ _ecore_wince_event_handle_focus_out(Ecore_WinCE_Callback_Data *msg) free(e); return; } - if (window->suspend) - window->suspend(window->backend); + if (window->suspend_cb) + window->suspend_cb(window->backend); e->window = window; diff --git a/legacy/ecore/src/lib/ecore_wince/ecore_wince_private.h b/legacy/ecore/src/lib/ecore_wince/ecore_wince_private.h index 2a604c0e8d..b506312f99 100644 --- a/legacy/ecore/src/lib/ecore_wince/ecore_wince_private.h +++ b/legacy/ecore/src/lib/ecore_wince/ecore_wince_private.h @@ -41,22 +41,22 @@ struct _Ecore_WinCE_Callback_Data }; -typedef int (*ecore_wince_suspend) (int); -typedef int (*ecore_wince_resume) (int); +typedef int (*ecore_wince_suspend_cb) (int); +typedef int (*ecore_wince_resume_cb) (int); struct _Ecore_WinCE_Window { - HWND window; + HWND window; - int backend; - ecore_wince_suspend suspend; - ecore_wince_resume resume; + int backend; + ecore_wince_suspend_cb suspend_cb; + 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 fullscreen : 1; + unsigned int pointer_is_in : 1; + unsigned int fullscreen : 1; }; extern HINSTANCE _ecore_wince_instance; diff --git a/legacy/ecore/src/lib/ecore_wince/ecore_wince_window.c b/legacy/ecore/src/lib/ecore_wince/ecore_wince_window.c index 12cbcfb882..db1af7f5bc 100644 --- a/legacy/ecore/src/lib/ecore_wince/ecore_wince_window.c +++ b/legacy/ecore/src/lib/ecore_wince/ecore_wince_window.c @@ -501,7 +501,7 @@ ecore_wince_window_backend_set(Ecore_WinCE_Window *window, * function should not be called if Ecore_Evas is used. */ 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; @@ -511,7 +511,7 @@ ecore_wince_window_suspend_set(Ecore_WinCE_Window *window, int (*suspend_cb)(int INF("setting suspend callback"); 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. */ 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; @@ -537,7 +537,7 @@ ecore_wince_window_resume_set(Ecore_WinCE_Window *window, int (*resume_cb)(int)) INF("setting resume callback"); w = (struct _Ecore_WinCE_Window *)window; - w->resume = resume; + w->resume_cb = resume_cb; } /**