formatting and warnings--

git-svn-id: http://svn.enlightenment.org/svn/e/trunk/ecore@57188 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/ecore_win32/ecore_win32.c b/src/lib/ecore_win32/ecore_win32.c
index e95ca73..ef7187a 100644 (file)
--- a/src/lib/ecore_win32/ecore_win32.c
+++ b/src/lib/ecore_win32/ecore_win32.c
@@ -117,11 +117,11 @@ _ecore_win32_window_procedure(HWND   window,
        return 0;
      case WM_LBUTTONUP:
        {
-          struct _Ecore_Win32_Window *w = NULL;
+          Ecore_Win32_Window *w = NULL;
 
           INF("left button up message");
 
-          w = (struct _Ecore_Win32_Window *)GetWindowLongPtr(window, GWL_USERDATA);
+          w = (Ecore_Win32_Window *)GetWindowLongPtr(window, GWL_USERDATA);
           if (w->drag.dragging)
             {
                ReleaseCapture();
@@ -142,12 +142,12 @@ _ecore_win32_window_procedure(HWND   window,
        return 0;
      case WM_MOUSEMOVE:
        {
-          RECT                        rect;
-          struct _Ecore_Win32_Window *w = NULL;
+          RECT                rect;
+          Ecore_Win32_Window *w = NULL;
 
           INF("moue move message");
 
-          w = (struct _Ecore_Win32_Window *)GetWindowLongPtr(window, GWL_USERDATA);
+          w = (Ecore_Win32_Window *)GetWindowLongPtr(window, GWL_USERDATA);
 
           if (w->drag.dragging)
             {

diff --git a/src/lib/ecore_win32/ecore_win32_dnd.c b/src/lib/ecore_win32/ecore_win32_dnd.c
index 7ac1083..a629c8b 100755 (executable)
--- a/src/lib/ecore_win32/ecore_win32_dnd.c
+++ b/src/lib/ecore_win32/ecore_win32_dnd.c
@@ -185,7 +185,7 @@ EAPI Eina_Bool
 ecore_win32_dnd_register_drop_target(Ecore_Win32_Window                 *window,
                                      Ecore_Win32_Dnd_DropTarget_Callback callback)
 {
-   struct _Ecore_Win32_Window *wnd = (struct _Ecore_Win32_Window *)window;
+   Ecore_Win32_Window *wnd = (Ecore_Win32_Window *)window;
 
    if (!window)
       return EINA_FALSE;
@@ -207,7 +207,7 @@ ecore_win32_dnd_register_drop_target(Ecore_Win32_Window                 *window,
 EAPI void
 ecore_win32_dnd_unregister_drop_target(Ecore_Win32_Window *window)
 {
-   struct _Ecore_Win32_Window *wnd = (struct _Ecore_Win32_Window *)window;
+   Ecore_Win32_Window *wnd = (Ecore_Win32_Window *)window;
 
    if (!window)
       return;

diff --git a/src/lib/ecore_win32/ecore_win32_dnd_data_object.cpp b/src/lib/ecore_win32/ecore_win32_dnd_data_object.cpp
index 6de1035..75e26f5 100644 (file)
--- a/src/lib/ecore_win32/ecore_win32_dnd_data_object.cpp
+++ b/src/lib/ecore_win32/ecore_win32_dnd_data_object.cpp
@@ -119,7 +119,7 @@ HRESULT DataObject::GetData(FORMATETC *pFormatEtc, STGMEDIUM *pMedium)
    return S_OK;
 }
 
-HRESULT DataObject::GetDataHere(FORMATETC *pFormatEtc, STGMEDIUM *pmedium)
+HRESULT DataObject::GetDataHere(FORMATETC *pFormatEtc __UNUSED__, STGMEDIUM *pmedium __UNUSED__)
 {
    return DATA_E_FORMATETC;
 }
@@ -129,14 +129,14 @@ HRESULT DataObject::QueryGetData(FORMATETC *pFormatEtc)
    return (lookup_format_etc(pFormatEtc) == -1) ? DV_E_FORMATETC : S_OK;
 }
 
-HRESULT DataObject::GetCanonicalFormatEtc(FORMATETC *pFormatEct, FORMATETC *pFormatEtcOut)
+HRESULT DataObject::GetCanonicalFormatEtc(FORMATETC *pFormatEct __UNUSED__, FORMATETC *pFormatEtcOut)
 {
    // Apparently we have to set this field to NULL even though we don't do anything else
    pFormatEtcOut->ptd = NULL;
    return E_NOTIMPL;
 }
 
-HRESULT DataObject::SetData(FORMATETC *pFormatEtc, STGMEDIUM *pMedium,  BOOL fRelease)
+HRESULT DataObject::SetData(FORMATETC *pFormatEtc __UNUSED__, STGMEDIUM *pMedium __UNUSED__,  BOOL fRelease __UNUSED__)
 {
    return E_NOTIMPL;
 }
@@ -157,17 +157,17 @@ HRESULT DataObject::EnumFormatEtc(DWORD dwDirection, IEnumFORMATETC **ppEnumForm
    }
 }
 
-HRESULT DataObject::DAdvise(FORMATETC *pFormatEtc,  DWORD advf, IAdviseSink *, DWORD *)
+HRESULT DataObject::DAdvise(FORMATETC *pFormatEtc __UNUSED__,  DWORD advf __UNUSED__, IAdviseSink *, DWORD *)
 {
    return OLE_E_ADVISENOTSUPPORTED;
 }
 
-HRESULT DataObject::DUnadvise(DWORD dwConnection)
+HRESULT DataObject::DUnadvise(DWORD dwConnection __UNUSED__)
 {
    return OLE_E_ADVISENOTSUPPORTED;
 }
 
-HRESULT DataObject::EnumDAdvise(IEnumSTATDATA **ppEnumAdvise)
+HRESULT DataObject::EnumDAdvise(IEnumSTATDATA **ppEnumAdvise __UNUSED__)
 {
    return OLE_E_ADVISENOTSUPPORTED;
 }

diff --git a/src/lib/ecore_win32/ecore_win32_dnd_drop_source.cpp b/src/lib/ecore_win32/ecore_win32_dnd_drop_source.cpp
index 065ac6a..bea7736 100644 (file)
--- a/src/lib/ecore_win32/ecore_win32_dnd_drop_source.cpp
+++ b/src/lib/ecore_win32/ecore_win32_dnd_drop_source.cpp
@@ -67,7 +67,7 @@ HRESULT DropSource::QueryContinueDrag(BOOL fEscapePressed, DWORD grfKeyState)
     return S_OK;
 }
 
-HRESULT DropSource::GiveFeedback(DWORD dwEffect)
+HRESULT DropSource::GiveFeedback(DWORD dwEffect __UNUSED__)
 {
     return DRAGDROP_S_USEDEFAULTCURSORS;
 }

diff --git a/src/lib/ecore_win32/ecore_win32_dnd_drop_target.cpp b/src/lib/ecore_win32/ecore_win32_dnd_drop_target.cpp
index 5051316..e19fb5d 100644 (file)
--- a/src/lib/ecore_win32/ecore_win32_dnd_drop_target.cpp
+++ b/src/lib/ecore_win32/ecore_win32_dnd_drop_target.cpp
@@ -152,7 +152,7 @@ HRESULT DropTarget::Drop(IDataObject *pDataObject, DWORD grfKeyState, POINTL pt,
 
 // internal helper function
 
-DWORD DropTarget::DropEffect(DWORD grfKeyState, POINTL pt, DWORD dwAllowed)
+DWORD DropTarget::DropEffect(DWORD grfKeyState, POINTL pt __UNUSED__, DWORD dwAllowed)
 {
    DWORD dwEffect = 0;
 

diff --git a/src/lib/ecore_win32/ecore_win32_window.c b/src/lib/ecore_win32/ecore_win32_window.c
index bcd216d..20edf81 100644 (file)
--- a/src/lib/ecore_win32/ecore_win32_window.c
+++ b/src/lib/ecore_win32/ecore_win32_window.c
@@ -40,12 +40,12 @@ ecore_win32_window_internal_new(Ecore_Win32_Window *parent,
                                 int                 height,
                                 DWORD               style)
 {
-   RECT                        rect;
-   struct _Ecore_Win32_Window *w;
-   int                         minimal_width;
-   int                         minimal_height;
+   RECT                rect;
+   Ecore_Win32_Window *w;
+   int                 minimal_width;
+   int                 minimal_height;
 
-   w = (struct _Ecore_Win32_Window *)calloc(1, sizeof(struct _Ecore_Win32_Window));
+   w = (Ecore_Win32_Window *)calloc(1, sizeof(Ecore_Win32_Window));
    if (!w)
      {
         ERR("malloc() failed");
@@ -84,7 +84,7 @@ ecore_win32_window_internal_new(Ecore_Win32_Window *parent,
                               x, y,
                               rect.right - rect.left,
                               rect.bottom - rect.top,
-                              parent ? ((struct _Ecore_Win32_Window *)parent)->window : NULL,
+                              parent ? ((Ecore_Win32_Window *)parent)->window : NULL,
                               NULL, _ecore_win32_instance, NULL);
    if (!w->window)
      {
@@ -230,7 +230,7 @@ ecore_win32_window_override_new(Ecore_Win32_Window *parent,
 EAPI void
 ecore_win32_window_free(Ecore_Win32_Window *window)
 {
-   struct _Ecore_Win32_Window *wnd = window;
+   Ecore_Win32_Window *wnd = window;
 
    if (!window) return;
 
@@ -239,7 +239,7 @@ ecore_win32_window_free(Ecore_Win32_Window *window)
    if (wnd->shape.mask)
       free(wnd->shape.mask);
 
-   DestroyWindow(((struct _Ecore_Win32_Window *)window)->window);
+   DestroyWindow(((Ecore_Win32_Window *)window)->window);
    free(window);
 }
 
@@ -256,7 +256,7 @@ ecore_win32_window_hwnd_get(Ecore_Win32_Window *window)
 {
    if (!window) return NULL;
 
-   return ((struct _Ecore_Win32_Window *)window)->window;
+   return ((Ecore_Win32_Window *)window)->window;
 }
 
 /*
@@ -287,7 +287,7 @@ ecore_win32_window_configure(Ecore_Win32_Window        *window,
     default:
       return;
     }
-  SetWindowPos((struct _Ecore_Win32_Window *)window->window, w, x, y, width, height, ???);
+  SetWindowPos((Ecore_Win32_Window *)window->window, w, x, y, width, height, ???);
 }
 */
 
@@ -315,7 +315,7 @@ ecore_win32_window_move(Ecore_Win32_Window *window,
 
    INF("moving window (%dx%d)", x, y);
 
-   w = ((struct _Ecore_Win32_Window *)window)->window;
+   w = ((Ecore_Win32_Window *)window)->window;
    if (!GetWindowRect(w, &rect))
      {
         ERR("GetWindowRect() failed");
@@ -347,20 +347,20 @@ ecore_win32_window_resize(Ecore_Win32_Window *window,
                           int                 width,
                           int                 height)
 {
-   RECT                        rect;
-   struct _Ecore_Win32_Window *w;
-   DWORD                       style;
-   int                         x;
-   int                         y;
-   int                         minimal_width;
-   int                         minimal_height;
+   RECT                rect;
+   Ecore_Win32_Window *w;
+   DWORD               style;
+   int                 x;
+   int                 y;
+   int                 minimal_width;
+   int                 minimal_height;
 
    /* FIXME: on fullscreen, should not resize it */
    if (!window) return;
 
    INF("resizing window (%dx%d)", width, height);
 
-   w = (struct _Ecore_Win32_Window *)window;
+   w = (Ecore_Win32_Window *)window;
 
    minimal_width = MAX(GetSystemMetrics(SM_CXMIN), (int)w->min_width);
    minimal_height = MAX(GetSystemMetrics(SM_CYMIN), (int)w->min_height);
@@ -421,18 +421,18 @@ ecore_win32_window_move_resize(Ecore_Win32_Window *window,
                                int                 width,
                                int                 height)
 {
-   RECT                        rect;
-   struct _Ecore_Win32_Window *w;
-   DWORD                       style;
-   int                         minimal_width;
-   int                         minimal_height;
+   RECT                rect;
+   Ecore_Win32_Window *w;
+   DWORD               style;
+   int                 minimal_width;
+   int                 minimal_height;
 
    /* FIXME: on fullscreen, should not move/resize it */
    if (!window) return;
 
    INF("moving and resizing window (%dx%d %dx%d)", x, y, width, height);
 
-   w = ((struct _Ecore_Win32_Window *)window);
+   w = ((Ecore_Win32_Window *)window);
 
    minimal_width = MAX(GetSystemMetrics(SM_CXMIN), (int)w->min_width);
    minimal_height = MAX(GetSystemMetrics(SM_CYMIN), (int)w->min_height);
@@ -504,7 +504,7 @@ ecore_win32_window_geometry_get(Ecore_Win32_Window *window,
         return;
      }
 
-   if (!GetClientRect(((struct _Ecore_Win32_Window *)window)->window,
+   if (!GetClientRect(((Ecore_Win32_Window *)window)->window,
                       &rect))
      {
         ERR("GetClientRect() failed");
@@ -520,7 +520,7 @@ ecore_win32_window_geometry_get(Ecore_Win32_Window *window,
    w = rect.right - rect.left;
    h = rect.bottom - rect.top;
 
-   if (!GetWindowRect(((struct _Ecore_Win32_Window *)window)->window,
+   if (!GetWindowRect(((Ecore_Win32_Window *)window)->window,
                       &rect))
      {
         ERR("GetWindowRect() failed");
@@ -570,7 +570,7 @@ ecore_win32_window_size_get(Ecore_Win32_Window *window,
         return;
      }
 
-   if (!GetClientRect(((struct _Ecore_Win32_Window *)window)->window,
+   if (!GetClientRect(((Ecore_Win32_Window *)window)->window,
                       &rect))
      {
         ERR("GetClientRect() failed");
@@ -599,12 +599,12 @@ ecore_win32_window_size_min_set(Ecore_Win32_Window *window,
                                 unsigned int        min_width,
                                 unsigned int        min_height)
 {
-   struct _Ecore_Win32_Window *w;
+   Ecore_Win32_Window *w;
 
    if (!window) return;
 
    printf ("ecore_win32_window_size_min_set : %p  %d %d\n", window, min_width, min_height);
-   w = (struct _Ecore_Win32_Window *)window;
+   w = (Ecore_Win32_Window *)window;
    w->min_width = min_width;
    w->min_height = min_height;
 }
@@ -625,11 +625,11 @@ ecore_win32_window_size_min_get(Ecore_Win32_Window *window,
                                 unsigned int       *min_width,
                                 unsigned int       *min_height)
 {
-   struct _Ecore_Win32_Window *w;
+   Ecore_Win32_Window *w;
 
    if (!window) return;
 
-   w = (struct _Ecore_Win32_Window *)window;
+   w = (Ecore_Win32_Window *)window;
    printf ("ecore_win32_window_size_min_get : %p  %d %d\n", window, w->min_width, w->min_height);
    if (min_width) *min_width = w->min_width;
    if (min_height) *min_height = w->min_height;
@@ -651,12 +651,12 @@ ecore_win32_window_size_max_set(Ecore_Win32_Window *window,
                                 unsigned int        max_width,
                                 unsigned int        max_height)
 {
-   struct _Ecore_Win32_Window *w;
+   Ecore_Win32_Window *w;
 
    if (!window) return;
 
    printf ("ecore_win32_window_size_max_set : %p  %d %d\n", window, max_width, max_height);
-   w = (struct _Ecore_Win32_Window *)window;
+   w = (Ecore_Win32_Window *)window;
    w->max_width = max_width;
    w->max_height = max_height;
 }
@@ -677,11 +677,11 @@ ecore_win32_window_size_max_get(Ecore_Win32_Window *window,
                                 unsigned int       *max_width,
                                 unsigned int       *max_height)
 {
-   struct _Ecore_Win32_Window *w;
+   Ecore_Win32_Window *w;
 
    if (!window) return;
 
-   w = (struct _Ecore_Win32_Window *)window;
+   w = (Ecore_Win32_Window *)window;
    printf ("ecore_win32_window_size_max_get : %p  %d %d\n", window, w->max_width, w->max_height);
    if (max_width) *max_width = w->max_width;
    if (max_height) *max_height = w->max_height;
@@ -703,12 +703,12 @@ ecore_win32_window_size_base_set(Ecore_Win32_Window *window,
                                  unsigned int        base_width,
                                  unsigned int        base_height)
 {
-   struct _Ecore_Win32_Window *w;
+   Ecore_Win32_Window *w;
 
    printf ("ecore_win32_window_size_base_set : %p  %d %d\n", window, base_width, base_height);
    if (!window) return;
 
-   w = (struct _Ecore_Win32_Window *)window;
+   w = (Ecore_Win32_Window *)window;
    w->base_width = base_width;
    w->base_height = base_height;
 }
@@ -729,11 +729,11 @@ ecore_win32_window_size_base_get(Ecore_Win32_Window *window,
                                  unsigned int       *base_width,
                                  unsigned int       *base_height)
 {
-   struct _Ecore_Win32_Window *w;
+   Ecore_Win32_Window *w;
 
    if (!window) return;
 
-   w = (struct _Ecore_Win32_Window *)window;
+   w = (Ecore_Win32_Window *)window;
    printf ("ecore_win32_window_size_base_get : %p  %d %d\n", window, w->base_width, w->base_height);
    if (base_width) *base_width = w->base_width;
    if (base_height) *base_height = w->base_height;
@@ -755,12 +755,12 @@ ecore_win32_window_size_step_set(Ecore_Win32_Window *window,
                                  unsigned int        step_width,
                                  unsigned int        step_height)
 {
-   struct _Ecore_Win32_Window *w;
+   Ecore_Win32_Window *w;
 
    printf ("ecore_win32_window_size_step_set : %p  %d %d\n", window, step_width, step_height);
    if (!window) return;
 
-   w = (struct _Ecore_Win32_Window *)window;
+   w = (Ecore_Win32_Window *)window;
    w->step_width = step_width;
    w->step_height = step_height;
 }
@@ -781,11 +781,11 @@ ecore_win32_window_size_step_get(Ecore_Win32_Window *window,
                                  unsigned int       *step_width,
                                  unsigned int       *step_height)
 {
-   struct _Ecore_Win32_Window *w;
+   Ecore_Win32_Window *w;
 
    if (!window) return;
 
-   w = (struct _Ecore_Win32_Window *)window;
+   w = (Ecore_Win32_Window *)window;
    printf ("ecore_win32_window_size_step_get : %p  %d %d\n", window, w->step_width, w->step_height);
    if (step_width) *step_width = w->step_width;
    if (step_height) *step_height = w->step_height;
@@ -797,7 +797,7 @@ ecore_win32_window_shape_set(Ecore_Win32_Window *window,
                              unsigned short      height,
                              unsigned char      *mask)
 {
-   struct _Ecore_Win32_Window *wnd;
+   Ecore_Win32_Window *wnd;
    HRGN                        rgn;
    int                         x;
    int                         y;
@@ -806,7 +806,7 @@ ecore_win32_window_shape_set(Ecore_Win32_Window *window,
    if (!window)
       return;
 
-   wnd = (struct _Ecore_Win32_Window *)window;
+   wnd = (Ecore_Win32_Window *)window;
 
    if (!mask)
      {
@@ -943,8 +943,8 @@ ecore_win32_window_show(Ecore_Win32_Window *window)
 
    INF("showing window");
 
-   ShowWindow(((struct _Ecore_Win32_Window *)window)->window, SW_SHOWNORMAL);
-   if (!UpdateWindow(((struct _Ecore_Win32_Window *)window)->window))
+   ShowWindow(((Ecore_Win32_Window *)window)->window, SW_SHOWNORMAL);
+   if (!UpdateWindow(((Ecore_Win32_Window *)window)->window))
      {
         ERR("UpdateWindow() failed");
      }
@@ -966,7 +966,7 @@ ecore_win32_window_hide(Ecore_Win32_Window *window)
 
    INF("hiding window");
 
-   ShowWindow(((struct _Ecore_Win32_Window *)window)->window, SW_HIDE);
+   ShowWindow(((Ecore_Win32_Window *)window)->window, SW_HIDE);
 }
 
 /**
@@ -984,7 +984,7 @@ ecore_win32_window_raise(Ecore_Win32_Window *window)
 
    INF("raising window");
 
-   if (!SetWindowPos(((struct _Ecore_Win32_Window *)window)->window,
+   if (!SetWindowPos(((Ecore_Win32_Window *)window)->window,
                      HWND_TOP, 0, 0, 0, 0,
                      SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE))
      {
@@ -1007,7 +1007,7 @@ ecore_win32_window_lower(Ecore_Win32_Window *window)
 
    INF("lowering window");
 
-   if (!SetWindowPos(((struct _Ecore_Win32_Window *)window)->window,
+   if (!SetWindowPos(((Ecore_Win32_Window *)window)->window,
                      HWND_BOTTOM, 0, 0, 0, 0,
                      SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE))
      {
@@ -1035,7 +1035,7 @@ ecore_win32_window_title_set(Ecore_Win32_Window *window,
 
    INF("setting window title");
 
-   if (!SetWindowText(((struct _Ecore_Win32_Window *)window)->window, title))
+   if (!SetWindowText(((Ecore_Win32_Window *)window)->window, title))
      {
         ERR("SetWindowText() failed");
      }
@@ -1056,7 +1056,7 @@ ecore_win32_window_focus_set(Ecore_Win32_Window *window)
 
    INF("focusing window");
 
-   if (!SetFocus(((struct _Ecore_Win32_Window *)window)->window))
+   if (!SetFocus(((Ecore_Win32_Window *)window)->window))
      {
         ERR("SetFocus() failed");
      }
@@ -1078,11 +1078,11 @@ EAPI void
 ecore_win32_window_iconified_set(Ecore_Win32_Window *window,
                                  Eina_Bool           on)
 {
-   struct _Ecore_Win32_Window *ew;
+   Ecore_Win32_Window *ew;
 
    if (!window) return;
 
-   ew = (struct _Ecore_Win32_Window *)window;
+   ew = (Ecore_Win32_Window *)window;
    if (((ew->iconified) && (on)) ||
        ((!ew->iconified) && (!on)))
      return;
@@ -1109,14 +1109,14 @@ EAPI void
 ecore_win32_window_borderless_set(Ecore_Win32_Window *window,
                                   Eina_Bool           on)
 {
-   RECT                        rect;
-   DWORD                       style;
-   struct _Ecore_Win32_Window *ew;
-   HWND                        w;
+   RECT                rect;
+   DWORD               style;
+   Ecore_Win32_Window *ew;
+   HWND                w;
 
    if (!window) return;
 
-   ew = (struct _Ecore_Win32_Window *)window;
+   ew = (Ecore_Win32_Window *)window;
    if (((ew->borderless) && (on)) ||
        ((!ew->borderless) && (!on)))
      return;
@@ -1187,12 +1187,12 @@ EAPI void
 ecore_win32_window_fullscreen_set(Ecore_Win32_Window *window,
                                   Eina_Bool           on)
 {
-   struct _Ecore_Win32_Window *ew;
+   Ecore_Win32_Window *ew;
    HWND                        w;
 
    if (!window) return;
 
-   ew = (struct _Ecore_Win32_Window *)window;
+   ew = (Ecore_Win32_Window *)window;
    if (((ew->fullscreen) && (on)) ||
        ((!ew->fullscreen) && (!on)))
      return;
@@ -1285,7 +1285,7 @@ ecore_win32_window_cursor_set(Ecore_Win32_Window *window,
    if (!window || !cursor)
      return;
 
-   if (!SetClassLongPtr(((struct _Ecore_Win32_Window *)window)->window,
+   if (!SetClassLongPtr(((Ecore_Win32_Window *)window)->window,
                      GCL_HCURSOR, (LONG_PTR)cursor))
      {
         ERR("SetClassLong() failed");
@@ -1320,41 +1320,41 @@ ecore_win32_window_state_set(Ecore_Win32_Window       *window,
         switch (state[i])
           {
           case ECORE_WIN32_WINDOW_STATE_ICONIFIED:
-            ((struct _Ecore_Win32_Window *)window)->state.iconified = 1;
+            ((Ecore_Win32_Window *)window)->state.iconified = 1;
             break;
           case ECORE_WIN32_WINDOW_STATE_MODAL:
-            ((struct _Ecore_Win32_Window *)window)->state.modal = 1;
+            ((Ecore_Win32_Window *)window)->state.modal = 1;
             break;
           case ECORE_WIN32_WINDOW_STATE_STICKY:
-            ((struct _Ecore_Win32_Window *)window)->state.sticky = 1;
+            ((Ecore_Win32_Window *)window)->state.sticky = 1;
             break;
           case ECORE_WIN32_WINDOW_STATE_MAXIMIZED_VERT:
-            ((struct _Ecore_Win32_Window *)window)->state.maximized_vert = 1;
+            ((Ecore_Win32_Window *)window)->state.maximized_vert = 1;
             break;
           case ECORE_WIN32_WINDOW_STATE_MAXIMIZED_HORZ:
-            ((struct _Ecore_Win32_Window *)window)->state.maximized_horz = 1;
+            ((Ecore_Win32_Window *)window)->state.maximized_horz = 1;
             break;
           case ECORE_WIN32_WINDOW_STATE_MAXIMIZED:
-            ((struct _Ecore_Win32_Window *)window)->state.maximized_horz = 1;
-            ((struct _Ecore_Win32_Window *)window)->state.maximized_vert = 1;
+            ((Ecore_Win32_Window *)window)->state.maximized_horz = 1;
+            ((Ecore_Win32_Window *)window)->state.maximized_vert = 1;
             break;
           case ECORE_WIN32_WINDOW_STATE_SHADED:
-            ((struct _Ecore_Win32_Window *)window)->state.shaded = 1;
+            ((Ecore_Win32_Window *)window)->state.shaded = 1;
             break;
           case ECORE_WIN32_WINDOW_STATE_HIDDEN:
-            ((struct _Ecore_Win32_Window *)window)->state.hidden = 1;
+            ((Ecore_Win32_Window *)window)->state.hidden = 1;
             break;
           case ECORE_WIN32_WINDOW_STATE_FULLSCREEN:
-            ((struct _Ecore_Win32_Window *)window)->state.fullscreen = 1;
+            ((Ecore_Win32_Window *)window)->state.fullscreen = 1;
             break;
           case ECORE_WIN32_WINDOW_STATE_ABOVE:
-            ((struct _Ecore_Win32_Window *)window)->state.above = 1;
+            ((Ecore_Win32_Window *)window)->state.above = 1;
             break;
           case ECORE_WIN32_WINDOW_STATE_BELOW:
-            ((struct _Ecore_Win32_Window *)window)->state.below = 1;
+            ((Ecore_Win32_Window *)window)->state.below = 1;
             break;
           case ECORE_WIN32_WINDOW_STATE_DEMANDS_ATTENTION:
-            ((struct _Ecore_Win32_Window *)window)->state.demands_attention = 1;
+            ((Ecore_Win32_Window *)window)->state.demands_attention = 1;
             break;
           case ECORE_WIN32_WINDOW_STATE_UNKNOWN:
             /* nothing to be done */
@@ -1381,12 +1381,12 @@ ecore_win32_window_state_request_send(Ecore_Win32_Window      *window,
                                       Ecore_Win32_Window_State state,
                                       unsigned int             set)
 {
-   struct _Ecore_Win32_Window *ew;
-   HWND                        w;
+   Ecore_Win32_Window *ew;
+   HWND                w;
 
    if (!window) return;
 
-   ew = (struct _Ecore_Win32_Window *)window;
+   ew = (Ecore_Win32_Window *)window;
    w = ew->window;
 
    INF("sending cursor state");
@@ -1535,31 +1535,31 @@ ecore_win32_window_type_set(Ecore_Win32_Window      *window,
    switch (type)
      {
      case ECORE_WIN32_WINDOW_TYPE_DESKTOP:
-       ((struct _Ecore_Win32_Window *)window)->type.desktop = 1;
+       ((Ecore_Win32_Window *)window)->type.desktop = 1;
        break;
      case ECORE_WIN32_WINDOW_TYPE_DOCK:
-       ((struct _Ecore_Win32_Window *)window)->type.dock = 1;
+       ((Ecore_Win32_Window *)window)->type.dock = 1;
        break;
      case ECORE_WIN32_WINDOW_TYPE_TOOLBAR:
-       ((struct _Ecore_Win32_Window *)window)->type.toolbar = 1;
+       ((Ecore_Win32_Window *)window)->type.toolbar = 1;
        break;
      case ECORE_WIN32_WINDOW_TYPE_MENU:
-       ((struct _Ecore_Win32_Window *)window)->type.menu = 1;
+       ((Ecore_Win32_Window *)window)->type.menu = 1;
        break;
      case ECORE_WIN32_WINDOW_TYPE_UTILITY:
-       ((struct _Ecore_Win32_Window *)window)->type.utility = 1;
+       ((Ecore_Win32_Window *)window)->type.utility = 1;
        break;
      case ECORE_WIN32_WINDOW_TYPE_SPLASH:
-       ((struct _Ecore_Win32_Window *)window)->type.splash = 1;
+       ((Ecore_Win32_Window *)window)->type.splash = 1;
        break;
      case ECORE_WIN32_WINDOW_TYPE_DIALOG:
-       ((struct _Ecore_Win32_Window *)window)->type.dialog = 1;
+       ((Ecore_Win32_Window *)window)->type.dialog = 1;
        break;
      case ECORE_WIN32_WINDOW_TYPE_NORMAL:
-       ((struct _Ecore_Win32_Window *)window)->type.normal = 1;
+       ((Ecore_Win32_Window *)window)->type.normal = 1;
        break;
      case ECORE_WIN32_WINDOW_TYPE_UNKNOWN:
-       ((struct _Ecore_Win32_Window *)window)->type.normal = 1;
+       ((Ecore_Win32_Window *)window)->type.normal = 1;
        break;
      }
 }

diff --git a/src/lib/ecore_wince/ecore_wince.c b/src/lib/ecore_wince/ecore_wince.c
index 5639c97..5638ad3 100644 (file)
--- a/src/lib/ecore_wince/ecore_wince.c
+++ b/src/lib/ecore_wince/ecore_wince.c
@@ -81,10 +81,10 @@ _ecore_wince_window_procedure(HWND   window,
        break;
      case WM_MOUSEMOVE:
        {
-          RECT                        rect;
-          struct _Ecore_WinCE_Window *w = NULL;
+          RECT                rect;
+          Ecore_WinCE_Window *w = NULL;
 
-          w = (struct _Ecore_WinCE_Window *)GetWindowLong(window, GWL_USERDATA);
+          w = (Ecore_WinCE_Window *)GetWindowLong(window, GWL_USERDATA);
 
           if (GetClientRect(window, &rect))
             {

diff --git a/src/lib/ecore_wince/ecore_wince_event.c b/src/lib/ecore_wince/ecore_wince_event.c
index bbab07f..d5cda30 100644 (file)
--- a/src/lib/ecore_wince/ecore_wince_event.c
+++ b/src/lib/ecore_wince/ecore_wince_event.c
@@ -730,7 +730,7 @@ void
 _ecore_wince_event_handle_focus_in(Ecore_WinCE_Callback_Data *msg)
 {
    Ecore_WinCE_Event_Window_Focus_In *e;
-   struct _Ecore_WinCE_Window        *window;
+   Ecore_WinCE_Window                *window;
 
    INF("focus in");
 
@@ -759,7 +759,7 @@ void
 _ecore_wince_event_handle_focus_out(Ecore_WinCE_Callback_Data *msg)
 {
    Ecore_WinCE_Event_Window_Focus_Out *e;
-   struct _Ecore_WinCE_Window         *window;
+   Ecore_WinCE_Window                 *window;
 
    INF("focus out");
 

diff --git a/src/lib/ecore_wince/ecore_wince_window.c b/src/lib/ecore_wince/ecore_wince_window.c
index db1af7f..747667d 100644 (file)
--- a/src/lib/ecore_wince/ecore_wince_window.c
+++ b/src/lib/ecore_wince/ecore_wince_window.c
@@ -99,13 +99,13 @@ ecore_wince_window_new(Ecore_WinCE_Window *parent,
                        int                 width,
                        int                 height)
 {
-   struct _Ecore_WinCE_Window *w;
-   HWND                        window;
-   RECT                        rect;
+   Ecore_WinCE_Window *w;
+   HWND                window;
+   RECT                rect;
 
    INF("creating window");
 
-   w = (struct _Ecore_WinCE_Window *)calloc(1, sizeof(struct _Ecore_WinCE_Window));
+   w = (Ecore_WinCE_Window *)calloc(1, sizeof(Ecore_WinCE_Window));
    if (!w)
      {
         ERR("malloc() failed");
@@ -129,7 +129,7 @@ ecore_wince_window_new(Ecore_WinCE_Window *parent,
                            WS_CAPTION | WS_SYSMENU | WS_VISIBLE,
                            x, y,
                            rect.right - rect.left, rect.bottom - rect.top,
-                           parent ? ((struct _Ecore_WinCE_Window *)parent)->window : NULL,
+                           parent ? ((Ecore_WinCE_Window *)parent)->window : NULL,
                            NULL, _ecore_wince_instance, NULL);
    if (!window)
      {
@@ -177,7 +177,7 @@ ecore_wince_window_free(Ecore_WinCE_Window *window)
 
    INF("destroying window");
 
-   DestroyWindow(((struct _Ecore_WinCE_Window *)window)->window);
+   DestroyWindow(((Ecore_WinCE_Window *)window)->window);
    free(window);
 }
 
@@ -195,7 +195,7 @@ ecore_wince_window_hwnd_get(Ecore_WinCE_Window *window)
    if (!window)
      return NULL;
 
-   return ((struct _Ecore_WinCE_Window *)window)->window;
+   return ((Ecore_WinCE_Window *)window)->window;
 }
 
 /**
@@ -217,12 +217,12 @@ ecore_wince_window_move(Ecore_WinCE_Window *window,
    RECT rect;
    HWND w;
 
-   if (!window || ((struct _Ecore_WinCE_Window *)window)->fullscreen)
+   if (!window || ((Ecore_WinCE_Window *)window)->fullscreen)
      return;
 
    INF("moving window (%dx%d)", x, y);
 
-   w = ((struct _Ecore_WinCE_Window *)window)->window;
+   w = ((Ecore_WinCE_Window *)window)->window;
    if (!GetWindowRect(w, &rect))
      {
         ERR("GetWindowRect() failed");
@@ -254,19 +254,19 @@ ecore_wince_window_resize(Ecore_WinCE_Window *window,
                           int                 width,
                           int                 height)
 {
-   RECT                        rect;
-   struct _Ecore_WinCE_Window *w;
-   DWORD                       style;
-   DWORD                       exstyle;
-   int                         x;
-   int                         y;
-
-   if (!window || ((struct _Ecore_WinCE_Window *)window)->fullscreen)
+   RECT                rect;
+   Ecore_WinCE_Window *w;
+   DWORD               style;
+   DWORD               exstyle;
+   int                 x;
+   int                 y;
+
+   if (!window || ((Ecore_WinCE_Window *)window)->fullscreen)
      return;
 
    INF("resizing window (%dx%d)", width, height);
 
-   w = (struct _Ecore_WinCE_Window *)window;
+   w = (Ecore_WinCE_Window *)window;
    if (!GetWindowRect(w->window, &rect))
      {
         ERR("GetWindowRect() failed");
@@ -324,17 +324,17 @@ ecore_wince_window_move_resize(Ecore_WinCE_Window *window,
                                int                 width,
                                int                 height)
 {
-   RECT                        rect;
-   struct _Ecore_WinCE_Window *w;
-   DWORD                       style;
-   DWORD                       exstyle;
+   RECT                rect;
+   Ecore_WinCE_Window *w;
+   DWORD               style;
+   DWORD               exstyle;
 
-   if (!window || ((struct _Ecore_WinCE_Window *)window)->fullscreen)
+   if (!window || ((Ecore_WinCE_Window *)window)->fullscreen)
      return;
 
    INF("moving and resizing window (%dx%d %dx%d)", x, y, width, height);
 
-   w = ((struct _Ecore_WinCE_Window *)window);
+   w = ((Ecore_WinCE_Window *)window);
    rect.left = 0;
    rect.top = 0;
    rect.right = width;
@@ -379,16 +379,16 @@ ecore_wince_window_show(Ecore_WinCE_Window *window)
 
    INF("showing window");
 
-   if (!ShowWindow(((struct _Ecore_WinCE_Window *)window)->window, SW_SHOWNORMAL))
+   if (!ShowWindow(((Ecore_WinCE_Window *)window)->window, SW_SHOWNORMAL))
      {
         ERR("ShowWindow() failed");
         return;
      }
-   if (!UpdateWindow(((struct _Ecore_WinCE_Window *)window)->window))
+   if (!UpdateWindow(((Ecore_WinCE_Window *)window)->window))
      {
         ERR("UpdateWindow() failed");
      }
-   if (!SendMessage(((struct _Ecore_WinCE_Window *)window)->window, WM_SHOWWINDOW, 1, 0))
+   if (!SendMessage(((Ecore_WinCE_Window *)window)->window, WM_SHOWWINDOW, 1, 0))
      {
         ERR("SendMessage() failed");
      }
@@ -409,12 +409,12 @@ ecore_wince_window_hide(Ecore_WinCE_Window *window)
 
    INF("hiding window");
 
-   if (!ShowWindow(((struct _Ecore_WinCE_Window *)window)->window, SW_HIDE))
+   if (!ShowWindow(((Ecore_WinCE_Window *)window)->window, SW_HIDE))
      {
         ERR("ShowWindow() failed");
         return;
      }
-   if (!SendMessage(((struct _Ecore_WinCE_Window *)window)->window, WM_SHOWWINDOW, 0, 0))
+   if (!SendMessage(((Ecore_WinCE_Window *)window)->window, WM_SHOWWINDOW, 0, 0))
      {
         ERR("SendMessage() failed");
      }
@@ -445,7 +445,7 @@ ecore_wince_window_title_set(Ecore_WinCE_Window *window,
    wtitle = evil_char_to_wchar(title);
    if (!wtitle) return;
 
-   if (!SetWindowText(((struct _Ecore_WinCE_Window *)window)->window, wtitle))
+   if (!SetWindowText(((Ecore_WinCE_Window *)window)->window, wtitle))
      {
         ERR("SetWindowText() failed");
      }
@@ -477,14 +477,14 @@ EAPI void
 ecore_wince_window_backend_set(Ecore_WinCE_Window *window,
                                int                 backend)
 {
-   struct _Ecore_WinCE_Window *w;
+   Ecore_WinCE_Window *w;
 
    if (!window)
      return;
 
    INF("setting backend");
 
-   w = (struct _Ecore_WinCE_Window *)window;
+   w = (Ecore_WinCE_Window *)window;
    w->backend = backend;
 }
 
@@ -503,14 +503,14 @@ ecore_wince_window_backend_set(Ecore_WinCE_Window *window,
 EAPI void
 ecore_wince_window_suspend_cb_set(Ecore_WinCE_Window *window, int (*suspend_cb)(int))
 {
-   struct _Ecore_WinCE_Window *w;
+   Ecore_WinCE_Window *w;
 
    if (!window)
      return;
 
    INF("setting suspend callback");
 
-   w = (struct _Ecore_WinCE_Window *)window;
+   w = (Ecore_WinCE_Window *)window;
    w->suspend_cb = suspend_cb;
 }
 
@@ -529,14 +529,14 @@ ecore_wince_window_suspend_cb_set(Ecore_WinCE_Window *window, int (*suspend_cb)(
 EAPI void
 ecore_wince_window_resume_cb_set(Ecore_WinCE_Window *window, int (*resume_cb)(int))
 {
-   struct _Ecore_WinCE_Window *w;
+   Ecore_WinCE_Window *w;
 
    if (!window)
      return;
 
    INF("setting resume callback");
 
-   w = (struct _Ecore_WinCE_Window *)window;
+   w = (Ecore_WinCE_Window *)window;
    w->resume_cb = resume_cb;
 }
 
@@ -579,7 +579,7 @@ ecore_wince_window_geometry_get(Ecore_WinCE_Window *window,
         return;
      }
 
-   if (!GetClientRect(((struct _Ecore_WinCE_Window *)window)->window,
+   if (!GetClientRect(((Ecore_WinCE_Window *)window)->window,
                       &rect))
      {
         ERR("GetClientRect() failed");
@@ -595,7 +595,7 @@ ecore_wince_window_geometry_get(Ecore_WinCE_Window *window,
    w = rect.right - rect.left;
    h = rect.bottom - rect.top;
 
-   if (!GetWindowRect(((struct _Ecore_WinCE_Window *)window)->window,
+   if (!GetWindowRect(((Ecore_WinCE_Window *)window)->window,
                       &rect))
      {
         ERR("GetWindowRect() failed");
@@ -645,7 +645,7 @@ ecore_wince_window_size_get(Ecore_WinCE_Window *window,
         return;
      }
 
-   if (!GetClientRect(((struct _Ecore_WinCE_Window *)window)->window,
+   if (!GetClientRect(((Ecore_WinCE_Window *)window)->window,
                       &rect))
      {
         ERR("GetClientRect() failed");
@@ -674,13 +674,13 @@ EAPI void
 ecore_wince_window_fullscreen_set(Ecore_WinCE_Window *window,
                                   Eina_Bool           on)
 {
-   struct _Ecore_WinCE_Window *ew;
-   HWND                        w;
-   HWND                        task_bar;
+   Ecore_WinCE_Window *ew;
+   HWND                w;
+   HWND                task_bar;
 
    if (!window) return;
 
-   ew = (struct _Ecore_WinCE_Window *)window;
+   ew = (Ecore_WinCE_Window *)window;
    if (((ew->fullscreen) && (on)) ||
        ((!ew->fullscreen) && (!on)))
      return;