forked from enlightenment/efl
parent
fb596336ab
commit
34e3b8f092
|
@ -31,9 +31,13 @@
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* FIXME: [deprecated] Convenience macros */
|
#ifndef MIN
|
||||||
#define ECORE_MIN(x, y) (((x) > (y)) ? (y) : (x))
|
#define MIN(x, y) (((x) > (y)) ? (y) : (x))
|
||||||
#define ECORE_MAX(x, y) (((x) > (y)) ? (x) : (y))
|
#endif
|
||||||
|
|
||||||
|
#ifndef MAX
|
||||||
|
#define MAX(x, y) (((x) > (y)) ? (x) : (y))
|
||||||
|
#endif
|
||||||
|
|
||||||
#define ECORE_EVENT_NONE 0
|
#define ECORE_EVENT_NONE 0
|
||||||
#define ECORE_EVENT_EXE_EXIT 1 /**< Spawned Exe has exit event */
|
#define ECORE_EVENT_EXE_EXIT 1 /**< Spawned Exe has exit event */
|
||||||
|
|
|
@ -170,8 +170,8 @@ _ecore_x_dnd_drag(int x, int y)
|
||||||
|
|
||||||
if (win)
|
if (win)
|
||||||
{
|
{
|
||||||
_xdnd->version = ECORE_MIN(ECORE_X_DND_VERSION,
|
_xdnd->version = MIN(ECORE_X_DND_VERSION,
|
||||||
ecore_x_dnd_version_get(win));
|
ecore_x_dnd_version_get(win));
|
||||||
if (win != _xdnd->dest)
|
if (win != _xdnd->dest)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
@ -186,7 +186,7 @@ _ecore_x_dnd_drag(int x, int y)
|
||||||
xev.xclient.data.l[1] &= 0xfffffffeUL;
|
xev.xclient.data.l[1] &= 0xfffffffeUL;
|
||||||
xev.xclient.data.l[1] |= ((unsigned long) _xdnd->version) << 24;
|
xev.xclient.data.l[1] |= ((unsigned long) _xdnd->version) << 24;
|
||||||
|
|
||||||
for (i = 0; i < ECORE_MIN(_xdnd->num_types, 3); ++i)
|
for (i = 0; i < MIN(_xdnd->num_types, 3); ++i)
|
||||||
xev.xclient.data.l[i + 2] = _xdnd->types[i];
|
xev.xclient.data.l[i + 2] = _xdnd->types[i];
|
||||||
XSendEvent(_ecore_x_disp, win, False, 0, &xev);
|
XSendEvent(_ecore_x_disp, win, False, 0, &xev);
|
||||||
_xdnd->await_status = 0;
|
_xdnd->await_status = 0;
|
||||||
|
|
Loading…
Reference in New Issue