Data of type Point is passed by value, not by reference.

diff --git a/Mac/Modules/ctl/Ctlmodule.c b/Mac/Modules/ctl/Ctlmodule.c
index 12e5809d88a60b6a4c8eb5cc931de3fb7b900f9b..991b567db129de8e6bb280c4ea8c4af00af28af9 100644 (file)
--- a/Mac/Modules/ctl/Ctlmodule.c
+++ b/Mac/Modules/ctl/Ctlmodule.c
@@ -2059,7 +2059,7 @@ myhittestproc(ControlHandle control, Point where)
        short c_rv = -1;
 
        ctl_obj = (ControlObject *)CtlObj_WhichControl(control);
-       arglist = Py_BuildValue("OO&", ctl_obj, PyMac_BuildPoint, &where);
+       arglist = Py_BuildValue("OO&", ctl_obj, PyMac_BuildPoint, where);
        rv = callcallback(ctl_obj, kControlUserPaneHitTestProcTag, arglist);
        Py_XDECREF(arglist);
        /* Ignore errors, nothing we can do about them */
@@ -2078,7 +2078,7 @@ mytrackingproc(ControlHandle control, Point startPt, ControlActionUPP actionProc
 
        ctl_obj = (ControlObject *)CtlObj_WhichControl(control);
        /* We cannot pass the actionProc without lots of work */
-       arglist = Py_BuildValue("OO&", ctl_obj, PyMac_BuildPoint, &startPt);
+       arglist = Py_BuildValue("OO&", ctl_obj, PyMac_BuildPoint, startPt);
        rv = callcallback(ctl_obj, kControlUserPaneTrackingProcTag, arglist);
        Py_XDECREF(arglist);
        if ( rv )

diff --git a/Mac/Modules/ctl/ctlsupport.py b/Mac/Modules/ctl/ctlsupport.py
index a826d5b95ed4c5c101de470608332c33401f8f2f..0df5d2b1ad9a1b9651ca41b37e3a773ea21627b0 100644 (file)
--- a/Mac/Modules/ctl/ctlsupport.py
+++ b/Mac/Modules/ctl/ctlsupport.py
@@ -252,7 +252,7 @@ myhittestproc(ControlHandle control, Point where)
        short c_rv = -1;
 
        ctl_obj = (ControlObject *)CtlObj_WhichControl(control);
-       arglist = Py_BuildValue("OO&", ctl_obj, PyMac_BuildPoint, &where);
+       arglist = Py_BuildValue("OO&", ctl_obj, PyMac_BuildPoint, where);
        rv = callcallback(ctl_obj, kControlUserPaneHitTestProcTag, arglist);
        Py_XDECREF(arglist);
        /* Ignore errors, nothing we can do about them */
@@ -271,7 +271,7 @@ mytrackingproc(ControlHandle control, Point startPt, ControlActionUPP actionProc
 
        ctl_obj = (ControlObject *)CtlObj_WhichControl(control);
        /* We cannot pass the actionProc without lots of work */
-       arglist = Py_BuildValue("OO&", ctl_obj, PyMac_BuildPoint, &startPt);
+       arglist = Py_BuildValue("OO&", ctl_obj, PyMac_BuildPoint, startPt);
        rv = callcallback(ctl_obj, kControlUserPaneTrackingProcTag, arglist);
        Py_XDECREF(arglist);
        if ( rv )

diff --git a/Mac/Modules/te/TEmodule.c b/Mac/Modules/te/TEmodule.c
index 5b6502031f88fda5548b53bbd379260d87c0fc05..98b8de8585b5679f75fbb0d02bd5bf6c89552ce6 100644 (file)
--- a/Mac/Modules/te/TEmodule.c
+++ b/Mac/Modules/te/TEmodule.c
@@ -45,7 +45,7 @@ extern PyObject *WinObj_WhichWindow(WindowPtr);
 #include <TextEdit.h>
 
 #define as_TE(h) ((TEHandle)h)
-#define as_Handle(teh) ((Handle)teh)
+#define as_Resource(teh) ((Handle)teh)
 
 /* Exported by Qdmodule.c: */
 extern PyObject *QdRGB_New(RGBColor *);
@@ -743,7 +743,7 @@ static PyObject *TEObj_TEGetHiliteRgn(_self, _args)
        return _res;
 }
 
-static PyObject *TEObj_as_Handle(_self, _args)
+static PyObject *TEObj_as_Resource(_self, _args)
        TEObject *_self;
        PyObject *_args;
 {
@@ -751,7 +751,7 @@ static PyObject *TEObj_as_Handle(_self, _args)
        Handle _rv;
        if (!PyArg_ParseTuple(_args, ""))
                return NULL;
-       _rv = as_Handle(_self->ob_itself);
+       _rv = as_Resource(_self->ob_itself);
        _res = Py_BuildValue("O&",
                             ResObj_New, _rv);
        return _res;
@@ -830,7 +830,7 @@ static PyMethodDef TEObj_methods[] = {
         "(short feature, short action) -> (short _rv)"},
        {"TEGetHiliteRgn", (PyCFunction)TEObj_TEGetHiliteRgn, 1,
         "(RgnHandle region) -> None"},
-       {"as_Handle", (PyCFunction)TEObj_as_Handle, 1,
+       {"as_Resource", (PyCFunction)TEObj_as_Resource, 1,
         "() -> (Handle _rv)"},
        {NULL, NULL, 0}
 };
@@ -857,7 +857,7 @@ static PyObject *TEObj_getattr(self, name)
                                        return Py_BuildValue("h", (*self->ob_itself)->fontAscent);
                                if( strcmp(name, "selPoint") == 0 )
                                        return Py_BuildValue("O&", PyMac_BuildPoint,
-                                                       &(*self->ob_itself)->selPoint);
+                                                       (*self->ob_itself)->selPoint);
                                if( strcmp(name, "selStart") == 0 )
                                        return Py_BuildValue("h", (*self->ob_itself)->selStart);
                                if( strcmp(name, "selEnd") == 0 )

diff --git a/Mac/Modules/te/tesupport.py b/Mac/Modules/te/tesupport.py
index b078649f2e46d521b19569c62915a84504fbf9fe..b33d0bd2f7ad50f1b6ede9ae1e957043994e420e 100644 (file)
--- a/Mac/Modules/te/tesupport.py
+++ b/Mac/Modules/te/tesupport.py
@@ -107,7 +107,7 @@ class MyObjectDefinition(GlobalObjectDefinition):
                                return Py_BuildValue("h", (*self->ob_itself)->fontAscent);
                        if( strcmp(name, "selPoint") == 0 )
                                return Py_BuildValue("O&", PyMac_BuildPoint,
-                                               &(*self->ob_itself)->selPoint);
+                                               (*self->ob_itself)->selPoint);
                        if( strcmp(name, "selStart") == 0 )
                                return Py_BuildValue("h", (*self->ob_itself)->selStart);
                        if( strcmp(name, "selEnd") == 0 )