another round... ported to __SC__

This commit is contained in:
Guido van Rossum 1995-02-19 15:59:49 +00:00
parent 295d171650
commit 9784295b15
14 changed files with 158 additions and 209 deletions

View file

@ -36,12 +36,10 @@ extern PyObject *WinObj_WhichWindow(WindowPtr);
#define resNotFound -192 /* Can't include <Errors.h> because of Python's "errors.h" */
#ifdef __MWERKS__
#ifdef HAVE_UNIVERSAL_HEADERS
#define WindowPeek WindowPtr
#endif
extern PyObject *WinObj_WhichWindow(WindowPtr w); /* Forward */
static PyObject *Win_Error;
/* ----------------------- Object type Window ----------------------- */
@ -56,7 +54,7 @@ typedef struct WindowObject {
} WindowObject;
PyObject *WinObj_New(itself)
const WindowPtr itself;
WindowPtr itself;
{
WindowObject *it;
if (itself == NULL) return PyMac_Error(resNotFound);
@ -844,7 +842,10 @@ WinObj_WhichWindow(w)
/* XXX What if we find a stdwin window or a window belonging
to some other package? */
it = (PyObject *) GetWRefCon(w);
if (w == NULL)
it = NULL;
else
it = (PyObject *) GetWRefCon(w);
if (it == NULL || ((WindowObject *)it)->ob_itself != w)
it = Py_None;
Py_INCREF(it);