2 files changed, 9 insertions, 15 deletions

diff --git a/src/lib/ecore_cocoa/Ecore_Cocoa.h b/src/lib/ecore_cocoa/Ecore_Cocoa.h
index 8d0e1bb8b2..f97bd20d27 100644
--- a/src/lib/ecore_cocoa/Ecore_Cocoa.h
+++ b/src/lib/ecore_cocoa/Ecore_Cocoa.h
@@ -55,12 +55,6 @@ typedef struct _Ecore_Cocoa_Window Ecore_Cocoa_Window;
 typedef struct _Ecore_Cocoa_Screen Ecore_Cocoa_Screen;
 
 /**
- * @typedef Ecore_Cocoa_Window_Id
- * Opaque handler to reference the actual Cocoa window
- */
-typedef void * Ecore_Cocoa_Window_Id;
-
-/**
  * @typedef Ecore_Cocoa_Object
  * Opaque handler to refer to an objective-c object (aka id)
  */
@@ -91,13 +85,13 @@ struct _Ecore_Cocoa_Event_Video_Resize
 {
    int             w; /**< Current width of the window */
    int             h; /**< Current height of the window */
-   Ecore_Cocoa_Window_Id wid; /**< Handler of the Cocoa window */
+   Ecore_Cocoa_Object *cocoa_window; /**< Handler of the Cocoa window */
 };
 
 typedef struct _Ecore_Cocoa_Event_Window Ecore_Cocoa_Event_Window;
 struct _Ecore_Cocoa_Event_Window
 {
-   Ecore_Cocoa_Window_Id wid;
+   Ecore_Cocoa_Object *cocoa_window;
 };
 
 /**
@@ -262,7 +256,7 @@ EAPI void ecore_cocoa_window_view_set(Ecore_Cocoa_Window *window,
 
 EAPI int ecore_cocoa_titlebar_height_get(void);
 
-EAPI Ecore_Cocoa_Window_Id ecore_cocoa_window_get_window_id(const Ecore_Cocoa_Window *window);
+EAPI Ecore_Cocoa_Object *ecore_cocoa_window_get(const Ecore_Cocoa_Window *window);
 
 
 EAPI Eina_Bool ecore_cocoa_selection_clipboard_set(const void *data, int size, Ecore_Cocoa_Cnp_Type type);
diff --git a/src/lib/ecore_cocoa/ecore_cocoa_window.m b/src/lib/ecore_cocoa/ecore_cocoa_window.m
index e50e9c334a..b1d7d6e59f 100644
--- a/src/lib/ecore_cocoa/ecore_cocoa_window.m
+++ b/src/lib/ecore_cocoa/ecore_cocoa_window.m
@@ -64,7 +64,7 @@ static NSCursor *_cursors[__ECORE_COCOA_CURSOR_LAST];
         CRI("Failed to allocate Ecore_Cocoa_Event_Window");
         return;
      }
-   event->wid = [notification object];
+   event->cocoa_window = [notification object];
    ecore_event_add(ECORE_COCOA_EVENT_WINDOW_DESTROY, event, NULL, NULL);
 }
 
@@ -82,7 +82,7 @@ static NSCursor *_cursors[__ECORE_COCOA_CURSOR_LAST];
    event->w = size.width;
    event->h = size.height -
       (([self isFullScreen] == YES) ? 0 : ecore_cocoa_titlebar_height_get());
-   event->wid = [notif object];
+   event->cocoa_window = [notif object];
    ecore_event_add(ECORE_COCOA_EVENT_RESIZE, event, NULL, NULL);
 
    /*
@@ -107,7 +107,7 @@ static NSCursor *_cursors[__ECORE_COCOA_CURSOR_LAST];
         CRI("Failed to allocate Ecore_Cocoa_Event_Window");
         return;
      }
-   e->wid = [notification object];
+   e->cocoa_window = [notification object];
    ecore_event_add(ECORE_COCOA_EVENT_GOT_FOCUS, e, NULL, NULL);
 }
 
@@ -131,7 +131,7 @@ static NSCursor *_cursors[__ECORE_COCOA_CURSOR_LAST];
         CRI("Failed to allocate Ecore_Cocoa_Event_Window");
         return;
      }
-   e->wid = [notification object];
+   e->cocoa_window = [notification object];
    ecore_event_add(ECORE_COCOA_EVENT_LOST_FOCUS, e, NULL, NULL);
 }
 
@@ -588,8 +588,8 @@ ecore_cocoa_window_view_set(Ecore_Cocoa_Window *window,
    [area release];
 }
 
-EAPI Ecore_Cocoa_Window_Id
-ecore_cocoa_window_get_window_id(const Ecore_Cocoa_Window *window)
+EAPI Ecore_Cocoa_Object *
+ecore_cocoa_window_get(const Ecore_Cocoa_Window *window)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(window, NULL);
    return window->window;