traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

reverse h/v in Point and Rect

This commit is contained in:
Guido van Rossum 1995-01-26 22:56:59 +00:00
parent efd9767f56
commit 5279ec683a
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Mac/Python/macglue.c
View File

@ -327,36 +327,38 @@ PyMac_GetFSSpec(PyObject *v, FSSpec *fs)
/* Convert a Python object to a Rect. /* Convert a Python object to a Rect.
The object must be a (top, left, bottom, right) tuple. The object must be a (left, top, right, bottom) tuple.
(Unfortunately this is different from STDWIN's convention). */ (This differs from the order in the struct but is consistent with
the arguments to SetRect(), and also with STDWIN). */
int int
PyMac_GetRect(PyObject *v, Rect *r) PyMac_GetRect(PyObject *v, Rect *r)
{ {
return PyArg_Parse(v, "(hhhh)", &r->top, &r->left, &r->bottom, &r->right); return PyArg_Parse(v, "(hhhh)", &r->left, &r->top, &r->right, &r->bottom);
} }
/* Convert a Rect to a Python object */ /* Convert a Rect to a Python object */
PyObject * PyObject *
PyMac_BuildRect(Rect *r) PyMac_BuildRect(Rect *r)
{ {
return Py_BuildValue("(hhhh)", r->top, r->left, r->bottom, r->right); return Py_BuildValue("(hhhh)", r->left, r->top, r->right, r->bottom);
} }
/* Convert a Python object to a Point. /* Convert a Python object to a Point.
The object must be a (v, h) tuple. The object must be a (h, v) tuple.
(Unfortunately this is different from STDWIN's convention). */ (This differs from the order in the struct but is consistent with
the arguments to SetPoint(), and also with STDWIN). */
int int
PyMac_GetPoint(PyObject *v, Point *p) PyMac_GetPoint(PyObject *v, Point *p)
{ {
return PyArg_Parse(v, "(hh)", &p->v, &p->h); return PyArg_Parse(v, "(hh)", &p->h, &p->v);
} }
/* Convert a Point to a Python object */ /* Convert a Point to a Python object */
PyObject * PyObject *
PyMac_BuildPoint(Point p) PyMac_BuildPoint(Point p)
{ {
return Py_BuildValue("(hh)", p.v, p.h); return Py_BuildValue("(hh)", p.h, p.v);
} }
@ -369,8 +371,8 @@ PyMac_GetEventRecord(PyObject *v, EventRecord *e)
&e->what, &e->what,
&e->message, &e->message,
&e->when, &e->when,
&e->where.v,
&e->where.h, &e->where.h,
&e->where.v,
&e->modifiers); &e->modifiers);
} }
@ -382,7 +384,7 @@ PyMac_BuildEventRecord(EventRecord *e)
e->what, e->what,
e->message, e->message,
e->when, e->when,
e->where.v,
e->where.h, e->where.h,
e->where.v,
e->modifiers); e->modifiers);
} }