forked from enlightenment/efl
ecore_cocoa: move Ecore_Cocoa_Cursor.h in Ecore_Cocoa.h
Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
This commit is contained in:
parent
e8c17ce341
commit
b21ab5b541
|
@ -6,8 +6,7 @@ lib_LTLIBRARIES += lib/ecore_cocoa/libecore_cocoa.la
|
||||||
|
|
||||||
installed_ecorecocoamainheadersdir = $(includedir)/ecore-cocoa-@VMAJ@
|
installed_ecorecocoamainheadersdir = $(includedir)/ecore-cocoa-@VMAJ@
|
||||||
dist_installed_ecorecocoamainheaders_DATA = \
|
dist_installed_ecorecocoamainheaders_DATA = \
|
||||||
lib/ecore_cocoa/Ecore_Cocoa.h \
|
lib/ecore_cocoa/Ecore_Cocoa.h
|
||||||
lib/ecore_cocoa/Ecore_Cocoa_Cursor.h
|
|
||||||
|
|
||||||
lib_ecore_cocoa_libecore_cocoa_la_SOURCES = \
|
lib_ecore_cocoa_libecore_cocoa_la_SOURCES = \
|
||||||
lib/ecore_cocoa/ecore_cocoa.m \
|
lib/ecore_cocoa/ecore_cocoa.m \
|
||||||
|
|
|
@ -34,7 +34,6 @@
|
||||||
# define EAPI
|
# define EAPI
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "Ecore_Cocoa_Cursor.h"
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
|
@ -84,6 +83,39 @@ typedef struct _Ecore_Cocoa_Event_Window_Unfocused Ecore_Cocoa_Event_Window_Unfo
|
||||||
*/
|
*/
|
||||||
typedef struct _Ecore_Cocoa_Event_Window_Destroy Ecore_Cocoa_Event_Window_Destroy;
|
typedef struct _Ecore_Cocoa_Event_Window_Destroy Ecore_Cocoa_Event_Window_Destroy;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @typedef Ecore_Cocoa_Cursor
|
||||||
|
* Values of the Cocoa cursors handled by Ecore_Cocoa
|
||||||
|
* See https://developer.apple.com/library/mac/documentation/Cocoa/Reference/ApplicationKit/Classes/NSCursor_Class/index.html for images of each cursors.
|
||||||
|
*/
|
||||||
|
typedef enum
|
||||||
|
{
|
||||||
|
ECORE_COCOA_CURSOR_ARROW = 0, /**< Arrow cursor */
|
||||||
|
ECORE_COCOA_CURSOR_CONTEXTUAL_MENU, /**< Contextual menu cursor */
|
||||||
|
ECORE_COCOA_CURSOR_CLOSED_HAND, /**< Closed hand cursor */
|
||||||
|
ECORE_COCOA_CURSOR_CROSSHAIR, /**< Crosshair cursor */
|
||||||
|
ECORE_COCOA_CURSOR_DISAPPEARING_ITEM, /**< Disappearing item cursor */
|
||||||
|
ECORE_COCOA_CURSOR_DRAG_COPY, /** Drag copy cursor */
|
||||||
|
ECORE_COCOA_CURSOR_DRAG_LINK, /**< Drag link cursor */
|
||||||
|
ECORE_COCOA_CURSOR_IBEAM, /**< IBeam cursor */
|
||||||
|
ECORE_COCOA_CURSOR_OPEN_HAND, /**< Open hand cursor */
|
||||||
|
ECORE_COCOA_CURSOR_OPERATION_NOT_ALLOWED, /**< Operation not allowed cursor */
|
||||||
|
ECORE_COCOA_CURSOR_POINTING_HAND, /**< Pointing hand cursor */
|
||||||
|
ECORE_COCOA_CURSOR_RESIZE_DOWN, /**< Resize down cursor */
|
||||||
|
ECORE_COCOA_CURSOR_RESIZE_LEFT, /**< Resize left cursor */
|
||||||
|
ECORE_COCOA_CURSOR_RESIZE_LEFT_RIGHT, /**< Resize left right cursor */
|
||||||
|
ECORE_COCOA_CURSOR_RESIZE_RIGHT, /**< Resize right cursor */
|
||||||
|
ECORE_COCOA_CURSOR_RESIZE_UP, /**< Resize up cursor */
|
||||||
|
ECORE_COCOA_CURSOR_RESIZE_UP_DOWN, /**< Resize up down cursor */
|
||||||
|
ECORE_COCOA_CURSOR_IBEAM_VERTICAL, /**< IBeam vertical cursor */
|
||||||
|
|
||||||
|
__ECORE_COCOA_CURSOR_LAST, /**< Sentinel. DO NOT USE */
|
||||||
|
|
||||||
|
ECORE_COCOA_CURSOR_DEFAULT = ECORE_COCOA_CURSOR_ARROW /**< Default Cocoa cursor */
|
||||||
|
|
||||||
|
} Ecore_Cocoa_Cursor;
|
||||||
|
|
||||||
|
|
||||||
/** Event triggered when a Cocoa window receives focus */
|
/** Event triggered when a Cocoa window receives focus */
|
||||||
EAPI extern int ECORE_COCOA_EVENT_WINDOW_FOCUSED;
|
EAPI extern int ECORE_COCOA_EVENT_WINDOW_FOCUSED;
|
||||||
|
|
||||||
|
|
|
@ -1,32 +0,0 @@
|
||||||
#ifndef __ECORE_COCOA_CURSOR_H__
|
|
||||||
#define __ECORE_COCOA_CURSOR_H__
|
|
||||||
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
ECORE_COCOA_CURSOR_ARROW = 0,
|
|
||||||
ECORE_COCOA_CURSOR_CONTEXTUAL_MENU,
|
|
||||||
ECORE_COCOA_CURSOR_CLOSED_HAND,
|
|
||||||
ECORE_COCOA_CURSOR_CROSSHAIR,
|
|
||||||
ECORE_COCOA_CURSOR_DISAPPEARING_ITEM,
|
|
||||||
ECORE_COCOA_CURSOR_DRAG_COPY,
|
|
||||||
ECORE_COCOA_CURSOR_DRAG_LINK,
|
|
||||||
ECORE_COCOA_CURSOR_IBEAM,
|
|
||||||
ECORE_COCOA_CURSOR_OPEN_HAND,
|
|
||||||
ECORE_COCOA_CURSOR_OPERATION_NOT_ALLOWED,
|
|
||||||
ECORE_COCOA_CURSOR_POINTING_HAND,
|
|
||||||
ECORE_COCOA_CURSOR_RESIZE_DOWN,
|
|
||||||
ECORE_COCOA_CURSOR_RESIZE_LEFT,
|
|
||||||
ECORE_COCOA_CURSOR_RESIZE_LEFT_RIGHT,
|
|
||||||
ECORE_COCOA_CURSOR_RESIZE_RIGHT,
|
|
||||||
ECORE_COCOA_CURSOR_RESIZE_UP,
|
|
||||||
ECORE_COCOA_CURSOR_RESIZE_UP_DOWN,
|
|
||||||
ECORE_COCOA_CURSOR_IBEAM_VERTICAL,
|
|
||||||
|
|
||||||
__ECORE_COCOA_CURSOR_LAST, /* Sentinel */
|
|
||||||
|
|
||||||
ECORE_COCOA_CURSOR_DEFAULT = ECORE_COCOA_CURSOR_ARROW
|
|
||||||
|
|
||||||
} Ecore_Cocoa_Cursor;
|
|
||||||
|
|
||||||
#endif /* ! __ECORE_COCOA_CURSOR_H__ */
|
|
||||||
|
|
|
@ -6,7 +6,6 @@
|
||||||
|
|
||||||
#include <Ecore.h>
|
#include <Ecore.h>
|
||||||
#include <Ecore_Cocoa.h>
|
#include <Ecore_Cocoa.h>
|
||||||
#include <Ecore_Cocoa_Cursor.h>
|
|
||||||
#import "ecore_cocoa_window.h"
|
#import "ecore_cocoa_window.h"
|
||||||
#import "ecore_cocoa_app.h"
|
#import "ecore_cocoa_app.h"
|
||||||
#include "ecore_cocoa_private.h"
|
#include "ecore_cocoa_private.h"
|
||||||
|
|
Loading…
Reference in New Issue